]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-4343-master
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 22 Aug 2013 15:59:39 +0000 (17:59 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 22 Aug 2013 15:59:39 +0000 (17:59 +0200)
commit9e1016f7d2aa7c23fc6287a563e6551809edcbe8
tree2ec3b29c78b88581aa12df4bee3262fee939907d
parentfed1792510ff11941765783653573f45fadc4c70
parent02b2b5a808b135007d8d54b837e70c38f02729fd
Merge branch 'master' into fixing-4343-master

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