7.3.22
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master # Conflicts: # VERSIONS # cosmogramme/php/_init.php # cosmogramme/sql/patch/patch_267.php # cosmogramme/sql/patch/patch_268.php # library/startup.php
Showing
- VERSIONS 14 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/27768 0 additions, 4 deletionsVERSIONS_HOTLINE/27768
- VERSIONS_HOTLINE/31941 0 additions, 1 deletionVERSIONS_HOTLINE/31941
- application/modules/admin/controllers/UsersController.php 1 addition, 2 deletionsapplication/modules/admin/controllers/UsersController.php
- application/modules/admin/views/scripts/users/_form.phtml 21 additions, 10 deletionsapplication/modules/admin/views/scripts/users/_form.phtml
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/sql/patch/patch_275.php 4 additions, 0 deletionscosmogramme/sql/patch/patch_275.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/admin/controllers/UsersControllerTest.php 33 additions, 4 deletions...ication/modules/admin/controllers/UsersControllerTest.php
- tests/db/UpgradeDBTest.php 27 additions, 0 deletionstests/db/UpgradeDBTest.php
Please register or sign in to comment