Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version
[pub/Android/ownCloud.git] / res / xml /
drwxr-xr-x   ..
-rw-r--r-- 1073 authenticator.xml
-rw-r--r-- 3578 preferences.xml
-rw-r--r-- 1152 syncadapter_files.xml