Skip to content
Commit 32b29c9d authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into fix-7307 

Conflicts:
	core/js/router.js
	settings/js/admin.js
parents 6de370b6 1785c0c9
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