nextcloud-android/res/xml
masensio efb3989ee6 Merge branch 'develop' into uploadWhenCharging
Conflicts:
	res/values-fr/strings.xml
	res/xml/preferences.xml
2015-09-01 16:51:40 +02:00
..
authenticator.xml Update year in license 2015-03-05 13:27:45 +01:00
preferences.xml Merge branch 'develop' into uploadWhenCharging 2015-09-01 16:51:40 +02:00
syncadapter_files.xml Update year in license 2015-03-05 13:27:45 +01:00