Skip to content
Commit 51295e9a authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge branch 'master' into sharing_mail_notification_master 

Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
parents a223cf76 514d7a88
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