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

Merge branch 'master' into sharing_mail_notification_master 

increased version number to trigger db update

Conflicts:
	lib/util.php
parents fd7469db 0527fb05
Hide whitespace changes
Inline Side-by-side
Showing
with 88 additions and 30 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