]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-4011-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 08:46:50 +0000 (10:46 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 08:46:50 +0000 (10:46 +0200)
commite3dee633393514402bc828e90b493d5168fdf837
tree576e0d81276f8b498b511909ca5ad76e0b208223
parent1ec7dff2fe1922a4690dc2537c0c64369ca86ea1
parent5899485ca17045e93528c29d1ed63b02192c4191
Merge branch 'master' into fixing-4011-master

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