Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
[pub/Android/ownCloud.git] / res / values-en-rGB /
drwxr-xr-x   ..
-rw-r--r-- 21638 strings.xml