nextcloud-android/src/com
David A. Velasco b36914df88 Merge branch 'develop' into file_browsing_refactoring
Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
2013-05-06 10:48:43 +02:00
..
owncloud/android Merge branch 'develop' into file_browsing_refactoring 2013-05-06 10:48:43 +02:00