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

Merge branch 'master' into sharing_mail_notification_master 

Conflicts:
	lib/util.php
parents 4bbefdf6 06870a6e
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
with 249 additions and 116 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment