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

Merge branch 'master' into doctrine 

Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php
parents ab2037ab c5f2ea9a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 600 additions and 272 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