Merge remote-tracking branch 'upstream/develop' into fileCount
Conflicts: res/layout/list_fragment.xml res/values/strings.xml src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Please register or sign in to comment