]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into sharing_mail_notification_master
authorBjoern Schiessle <schiessle@owncloud.com>
Mon, 23 Sep 2013 09:18:00 +0000 (11:18 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Mon, 23 Sep 2013 09:18:00 +0000 (11:18 +0200)
commitfc76a13c520d1d5345c721e0616d770e1fd344ea
tree1dc8e108588a52182e0c8c346423aab171e66944
parent534d93d2d3d549039db2661cdc4b9e939a0abe0d
parent9851f0f4f2a97dc6ac1382bcd533eb23feffa4e0
Merge branch 'master' into sharing_mail_notification_master

Conflicts:
lib/public/share.php
apps/files/index.php
core/js/share.js
db_structure.xml
lib/public/share.php