Skip to content
Commit 9898ba4d authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into master-sqlserver 

Conflicts:
	core/templates/installation.php
parents 5062ae25 78fce834
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