]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-4546-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 14 Oct 2013 08:56:50 +0000 (10:56 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 14 Oct 2013 08:56:50 +0000 (10:56 +0200)
commita5e808defc5a6afd38df429768d76c283305a4f2
tree7676d5b9f3e45967a6f9031c4829f47762079b8a
parent61a534fb60eb275344e6cf7890fdfe88657e53a6
parentf3336f8877771e53d303f6f939f0005fa9692b7a
Merge branch 'master' into fixing-4546-master

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