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

Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename 

Conflicts:
	apps/files/js/filelist.js
parents 8ed73e5c 2d14daf3
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