nextcloud-android/src
tobiasKaminsky fbc3d970c5 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
2014-10-24 18:18:06 +02:00
..
com/owncloud/android Merge remote-tracking branch 'upstream/develop' into fileCount 2014-10-24 18:18:06 +02:00
third_parties/daveKoeller - added lgpgl 2014-10-18 10:47:36 +02:00