Skip to content
Commit 14a53819 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into fs-backend-registration 

Conflicts:
	apps/files_external/templates/settings.php
parents c0ebc1df e2969062
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