Skip to content
Commit fbcf6238 authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Merge branch 'master' into external_storage_ui_feedback 

Conflicts:
	apps/files_external/lib/webdav.php
parents 78043d73 912050af
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