Merge branch 'dev#38655_2440_agrandissement_champ_custom_fields'
Conflicts: cosmogramme/sql/patch/patch_290.php tests/db/UpgradeDBTest.php
Showing
- VERSIONS_WIP/38655 1 addition, 0 deletionsVERSIONS_WIP/38655
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/sql/patch/patch_291.php 5 additions, 0 deletionscosmogramme/sql/patch/patch_291.php
- tests/db/UpgradeDBTest.php 36 additions, 1 deletiontests/db/UpgradeDBTest.php
Please register or sign in to comment