nextcloud-android/src
tobiasKaminsky 4867bb32c3 Merge remote-tracking branch 'upstream/develop' into imageGrid
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-11-18 18:08:28 +01:00
..
com/owncloud/android Merge remote-tracking branch 'upstream/develop' into imageGrid 2014-11-18 18:08:28 +01:00
third_parties/daveKoeller - added lgpgl 2014-10-18 10:47:36 +02:00