Skip to content
Commit afb5de95 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into fixing-998-master 

Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
parents 130c9cad 31cc9aa8
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