Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files
Conflicts: res/menu/main_menu.xml src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Please register or sign in to comment