Merge branch 'develop' into instant_uploads_set_path
[pub/Android/ownCloud.git] / res / values-fa /
drwxr-xr-x   ..
-rw-r--r-- 21599 strings.xml