Skip to content
Commit 1d44a99e authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into updater-CSP 

Conflicts:
	core/templates/update.php
parents dbc13cf6 31d83fdd
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