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

Merge branch 'master' into sharing_mail_notification_master

Conflicts:
	lib/private/util.php
parents 084f76fd 535ed836
Branches
No related tags found
No related merge requests found
Showing
with 87 additions and 20 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment