Fixed double request for ConflictsResolveActivity
[pub/Android/ownCloud.git] / res / values-es /
drwxr-xr-x   ..
-rw-r--r-- 26632 strings.xml