Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version
[pub/Android/ownCloud.git] / res / values-te /
drwxr-xr-x   ..
-rw-r--r-- 1629 strings.xml