Skip to content
Commit 9019ad55 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename 

Conflicts:
	apps/files/js/filelist.js
parents ca3771f8 d2fa0f5f
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