Merge branch 'stable' into hotline-master
Conflicts: VERSIONS cosmogramme/php/_init.php cosmogramme/sql/patch/patch_307.php library/startup.php tests/db/UpgradeDBTest.php
Showing
Please register or sign in to comment
Conflicts: VERSIONS cosmogramme/php/_init.php cosmogramme/sql/patch/patch_307.php library/startup.php tests/db/UpgradeDBTest.php