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

Merge branch 'master' into setup 

Conflicts:
	core/setup.php
parents 09d2ba01 271088a7
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1263 additions and 788 deletions
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