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

Merge branch 'master' into fixing-998-master 

Conflicts:
	apps/files/js/files.js
parents 1dd70ac5 53b95cb8
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