]> source.dussan.org Git - nextcloud-server.git/commitdiff
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)
Conflicts:
lib/private/connector/sabre/file.php

1  2 
lib/private/connector/sabre/directory.php
lib/private/connector/sabre/file.php

Simple merge