Fixed 'keep both' action in conflicts dialog (both resulting file were linked to...
[pub/Android/ownCloud.git] / doc /
drwxr-xr-x   ..
-rw-r--r-- 409520 rfc2518-WEBDAV-Spec.html
-rw-r--r-- 211885 rfc6352-CardDAV-Spec.html