Merge branch 'develop' into obeySortOrder_fixmerge
authorjabarros <jabarros@solidgear.es>
Fri, 26 Dec 2014 10:10:22 +0000 (11:10 +0100)
committerjabarros <jabarros@solidgear.es>
Fri, 26 Dec 2014 10:10:22 +0000 (11:10 +0100)
commit4257aa1d9c53facbd1b59cc037b14dadeec5d2f2
treee453abe02cb50118acfe1b4f657e53c11ad6119e
parente23fa3acaa3eb1ab7d77c05c9c3d64b3ce2867c6
parent0b7c37671fe97fafaa177cbea22a1d169d52deb8
Merge branch 'develop' into obeySortOrder_fixmerge
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/utils/FileStorageUtils.java