Skip to content
Snippets Groups Projects
Commit a223cf76 authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core... 

Merge branch 'sharing_mail_notification_master' of github.com:owncloud/core into sharing_mail_notification_master

Conflicts:
	core/ajax/share.php
parents 304803d1 d09b1553
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 112 additions and 90 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment