version 7.5.27
Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master Conflicts: VERSIONS cosmogramme/php/_init.php cosmogramme/sql/patch/patch_290.php library/startup.php tests/db/UpgradeDBTest.php
Showing
- VERSIONS 11 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/41525 0 additions, 1 deletionVERSIONS_HOTLINE/41525
- VERSIONS_HOTLINE/42776 0 additions, 1 deletionVERSIONS_HOTLINE/42776
- VERSIONS_HOTLINE/42914 0 additions, 1 deletionVERSIONS_HOTLINE/42914
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/sql/patch/patch_295.php 16 additions, 0 deletionscosmogramme/sql/patch/patch_295.php
- cosmogramme/tests/php/classes/NoticeIntegrationAloesTest.php 528 additions, 0 deletionscosmogramme/tests/php/classes/NoticeIntegrationAloesTest.php
- cosmogramme/tests/php/classes/NoticeIntegrationTest.php 0 additions, 531 deletionscosmogramme/tests/php/classes/NoticeIntegrationTest.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/db/UpgradeDBTest.php 15 additions, 0 deletionstests/db/UpgradeDBTest.php
Please register or sign in to comment