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

Merge branch 'master' into doctrine 

Conflicts:
	lib/db.php
parents e1818675 3c06020e
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