]> 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 08:06:36 +0000 (10:06 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 08:06:36 +0000 (10:06 +0200)
commitfe352664a2694c8ecb60ad835461829ae285cde7
treef2461e5f3d977f13c93735ddc39dc466b7257323
parent39599019e5c3e47c5d03a1b63b438cacdab5b37e
parent5899485ca17045e93528c29d1ed63b02192c4191
Merge branch 'master' into fixing-4546-master

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