Skip to content
Snippets Groups Projects
Commit 534d93d2 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
parents f8563ec5 46f59b16
No related branches found
No related tags found
Loading
Showing
with 627 additions and 241 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment