]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sharing_mail_notification_master
authorBjoern Schiessle <schiessle@owncloud.com>
Mon, 16 Sep 2013 08:40:06 +0000 (10:40 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Mon, 16 Sep 2013 08:40:06 +0000 (10:40 +0200)
commit534d93d2d3d549039db2661cdc4b9e939a0abe0d
tree7868026ba14b6558c8e50b601a9a5fa85fdc585b
parentf8563ec5831713b341db1b2cd480328912818607
parent46f59b165e5bd1908509e8a62b67bf983cfd6224
Merge branch 'master' into sharing_mail_notification_master

Conflicts:
apps/files/index.php
apps/files/index.php
apps/files/templates/index.php
core/js/share.js
lib/public/share.php
lib/util.php