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

Merge branch 'master' into fixing-js-errors-public-link-master 

Conflicts:
	apps/files/js/files.js
	apps/files/templates/part.list.php
parents 11e88f49 317261d6
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