Skip to content
Snippets Groups Projects
Commit 2be77eef authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'stable'

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	library/startup.php
	tests/db/UpgradeDBTest.php
parents 47273e88 e776277b
Branches
Tags
6 merge requests!1587Master,!1553Master,!1519Master,!1506Master,!1502Master,!1500Master
Showing
with 476 additions and 153 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