Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2
Conflicts: src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Please register or sign in to comment