]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into...
authorBjoern Schiessle <schiessle@owncloud.com>
Fri, 4 Oct 2013 10:27:18 +0000 (12:27 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Fri, 4 Oct 2013 10:27:18 +0000 (12:27 +0200)
commita223cf769a670c1c8926baf4ded445af300d056d
treefe2625cc9bd2ddbacdfda9dae69aaa312b0675b2
parent304803d102fed4f9a7acf404f76fcf49d82f5a43
parentd09b1553d0356adb894854884c672e3696a74f4e
Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master

Conflicts:
core/ajax/share.php