Merge branch 'stable' into hotline-master
Conflicts: VERSIONS library/startup.php
Showing
- VERSIONS 5 additions, 0 deletionsVERSIONS
- library/ZendAfi/Form/Admin/User.php 2 additions, 8 deletionslibrary/ZendAfi/Form/Admin/User.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/admin/controllers/UsersControllerTest.php 23 additions, 22 deletions...ication/modules/admin/controllers/UsersControllerTest.php
Please register or sign in to comment