]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0ebc1d e296906)
Merge branch 'master' into fs-backend-registration
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 3 Apr 2014 15:04:16 +0000 (17:04 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 3 Apr 2014 15:04:16 +0000 (17:04 +0200)
Conflicts:
apps/files_external/templates/settings.php

1  2 
apps/files_external/lib/webdav.php patch | diff1 | diff2 | blob | history

diff --cc apps/files_external/lib/webdav.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server