Skip to content
Snippets Groups Projects
Commit 2da0956a authored by Laurent's avatar Laurent
Browse files

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
	tests/db/UpgradeDBTest.php
parents 617d0b34 f2698065
Branches
Tags
Showing
with 353 additions and 93 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