Merge remote-tracking branch 'origin/master' into cancel_in_upload
[pub/Android/ownCloud.git] / res / values-oc /
drwxr-xr-x   ..
-rw-r--r-- 4530 strings.xml