]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into type-hinting-sharing
authorBart Visscher <bartv@thisnet.nl>
Mon, 28 Apr 2014 15:59:41 +0000 (17:59 +0200)
committerBart Visscher <bartv@thisnet.nl>
Mon, 28 Apr 2014 15:59:41 +0000 (17:59 +0200)
commit66b1ad0a9be76a179155c8ce6a47310f93e8bb42
treec9ba3dfabe91602db2966d187f812bdfcd9dc3da
parenta9bf3df82d0c3d0f54c9fe45dbb911756f37b166
parentc591cf0836720a4cfc6d441b363ece46ed19eadc
Merge branch 'master' into type-hinting-sharing

Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
apps/files_sharing/lib/cache.php
apps/files_sharing/lib/helper.php
apps/files_sharing/lib/share/file.php
lib/private/share/share.php
lib/public/share.php