Skip to content
Snippets Groups Projects
Commit bae17551 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into fixing-784-master

Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
	lib/helper.php
parents 39d874cd 08d7b8ce
No related branches found
No related tags found
Loading
Showing
with 111 additions and 19 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment