]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sharing_mail_notification_master
authorBjoern Schiessle <schiessle@owncloud.com>
Wed, 2 Oct 2013 08:11:18 +0000 (10:11 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Wed, 2 Oct 2013 08:11:18 +0000 (10:11 +0200)
commit8b08b1b455b474de3fa376dfafa3de63727364ea
tree536b2d4ba4f979d69f4f6e73755e06635345f78a
parent084f76fd14125023d5b7277c558eb86a20ea07d3
parent535ed8369f701a184340a428e82cc8d7cc7588bb
Merge branch 'master' into sharing_mail_notification_master

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