Skip to content
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
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