mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-android/res/xml
History
David A. Velasco 802a164616 Merge branch 'develop' into pinEnhancement 
Conflicts SOLVED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/activity/Uploader.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2015-04-28 14:20:17 +02:00
..
authenticator.xml Update year in license 2015-03-05 13:27:45 +01:00
preferences.xml Merge branch 'develop' into pinEnhancement 2015-04-28 14:20:17 +02:00
syncadapter_files.xml Update year in license 2015-03-05 13:27:45 +01:00