]> 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 09:36:08 +0000 (11:36 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 09:36:08 +0000 (11:36 +0200)
commitc62dc4fa80d622ed7651029e9ddff2a6c6327143
tree897a298b43f58b07de74188ae38f95965e9846d5
parentfdc87eaeb360ad14ed243368ea8f74aafed32304
parentebb2278a6770cc68698e1ba5cb914d615b573519
Merge branch 'master' into fixing-4011-master

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