Merge branch 'develop' into download_folder
authorjabarros <jabarros@solidgear.es>
Mon, 19 Jan 2015 11:49:28 +0000 (12:49 +0100)
committerjabarros <jabarros@solidgear.es>
Mon, 19 Jan 2015 11:49:28 +0000 (12:49 +0100)
commite98fc8b141fed66cbdd265aaebd2cfa3affb68ac
treede94963a6a341ede6f37ee678f39f0b93a03f434
parent2275f2eca4a223618194bf4f6b5b41f50d4b1d36
parente99583ef686e04419d7c871c9e36a9b6167aadaa
Merge branch 'develop' into download_folder
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java