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

Merge branch 'master' into fix_minor_files_annoyances 

Conflicts:
	apps/files/js/files.js
parents 9cd7bb2c 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