Skip to content
Commit 9c23c344 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into sharing_mail_notification_master 

Conflicts:
	core/css/share.css
parents 8b08b1b4 de175a4b
Hide whitespace changes
Inline Side-by-side
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