Skip to content
Commit 17337b22 authored by Jörn Friedrich Dreyer's avatar Jörn Friedrich Dreyer
Browse files

Merge branch 'master' into fix_3728_with_file_exists_dialog 

Conflicts:
	apps/files/js/file-upload.js
parents ec1949f5 1eb42626
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