nextcloud-android/src
tobiasKaminsky d54345d040 Merge remote-tracking branch 'upstream/develop' into uploadNewFolder
Conflicts:
	src/com/owncloud/android/ui/activity/Uploader.java
2015-01-08 22:41:41 +01:00
..
com/owncloud/android Merge remote-tracking branch 'upstream/develop' into uploadNewFolder 2015-01-08 22:41:41 +01:00
third_parties/daveKoeller - added lgpgl 2014-10-18 10:47:36 +02:00