]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-4546-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 7 Oct 2013 15:47:54 +0000 (17:47 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 7 Oct 2013 15:47:54 +0000 (17:47 +0200)
commit5e397d89c4152aee48692b1d302f1f11b16838b3
tree1f9e20c9ad153b3d1dd2ad077c1f97a8da8a7815
parenta2301e8b6975a213f05468f171229f7a1986a377
parenta3d0e29aa5df3390929c6378bd4f9c6bbf25c473
Merge branch 'master' into fixing-4546-master

Conflicts:
lib/private/connector/sabre/directory.php
lib/private/cache/file.php
lib/private/connector/sabre/directory.php
lib/private/filechunking.php