]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-4546-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 09:45:52 +0000 (11:45 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 09:45:52 +0000 (11:45 +0200)
commita2301e8b6975a213f05468f171229f7a1986a377
tree5e0ad1b6c1afaa5a3184b16eec4d63f9a4553986
parentfe352664a2694c8ecb60ad835461829ae285cde7
parentebb2278a6770cc68698e1ba5cb914d615b573519
Merge branch 'master' into fixing-4546-master

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