Skip to content
Commit ec45a843 authored by sherbrecher's avatar sherbrecher
Browse files

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	apps/files_external/templates/settings.php
parents d2b3a9fb ebb2cb34
Expand all 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