Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files (7d9fc685) · Commits · github / nextcloud / android

Commit 7d9fc685 authored Oct 09, 2014 by

jabarros

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

parents 95639df3 be7eb6e9

Hide whitespace changes

Inline Side-by-side

Please register or to comment