]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into chunked_upload
authorBart Visscher <bartv@thisnet.nl>
Fri, 27 Jul 2012 09:40:51 +0000 (11:40 +0200)
committerBart Visscher <bartv@thisnet.nl>
Fri, 27 Jul 2012 09:40:51 +0000 (11:40 +0200)
commita7a54331082c41c5b05cd7982c058caf1556f777
treebc51551c2430837856cdb1f3a1e04c46e0f664cb
parente8010209bb1ec8ef9ecc1cff7ac2b2d4d414bd74
parentd26f87e738314db7820f39f74f42865ff20f7bd7
Merge branch 'master' into chunked_upload

Conflicts:
lib/connector/sabre/directory.php
lib/connector/sabre/directory.php