nextcloud-android/res/xml
masensio b66e309dfa Merge branch 'contact_settings' into setup_app_name
Conflicts:
	res/values/setup.xml
2013-10-18 12:42:00 +02:00
..
authenticator.xml OC-1663: Replace references to app_name in code 2013-10-17 16:54:43 +02:00
preferences.xml OC-1656: Disable/enable help-imprint-feedback options 2013-10-16 08:56:41 +02:00
preferences_new_session.xml Copyright note fixes 2013-04-17 12:26:13 +02:00
syncadapter_files.xml OC-1663: Replace references to app_name in code 2013-10-17 16:54:43 +02:00