]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into shared-folder-etags
authorMichael Gapczynski <mtgap@owncloud.com>
Wed, 6 Mar 2013 02:54:32 +0000 (21:54 -0500)
committerMichael Gapczynski <mtgap@owncloud.com>
Wed, 6 Mar 2013 02:54:32 +0000 (21:54 -0500)
commit4dcbaa1d7bf3c94a92ac8a848305913e57a17ec5
tree59113a180157e2037f3c127489e735bba173ccd6
parentee0c38bb5112af4aa491b526ca390de52dd3ab7e
parentc1a32b50735b0a8558823d111e546865ddcba790
Merge branch 'master' into shared-folder-etags

Conflicts:
apps/files_sharing/appinfo/app.php
apps/files_sharing/appinfo/app.php
lib/public/share.php