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

Merge branch 'master' into sharing_mail_notification_master

Conflicts:
	lib/public/share.php
parents 534d93d2 9851f0f4
Loading
Showing
with 1688 additions and 641 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment