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

Merge branch 'master' into fix_glob_escaping

Conflicts:
	apps/files_trashbin/lib/trash.php
parents efb026c6 6156d718
No related branches found
No related tags found
No related merge requests found
Showing
with 103 additions and 12 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