Skip to content
Commit edd92e4c authored by Christopher Schäpers's avatar Christopher Schäpers
Browse files

Merge branch 'master' into fix_jslint_kondou 

Conflicts:
	apps/files/js/file-upload.js
parents 1348330c 12f4494d
Expand all 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