Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2 (6970560d) · Commits · github / nextcloud / android

Commit 6970560d authored Oct 23, 2014 by

jabarros

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

parents 2fad1e1a bc4a7bfe

Hide whitespace changes

Inline Side-by-side

Please register or to comment