Skip to content
Commit bca725dc authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge branch 'master' into setup

Conflicts:
	core/setup.php
parents 09d2ba01 271088a7
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