]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 304803d d09b155)
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)
Conflicts:
core/ajax/share.php


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server