Merge branch 'stable' into hotline-master
Conflicts: VERSIONS library/startup.php
Showing
- VERSIONS 1 addition, 1 deletionVERSIONS
- library/Class/ScriptLoader.php 4 additions, 4 deletionslibrary/Class/ScriptLoader.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/opac/controllers/RechercheControllerTest.php 2 additions, 2 deletions...tion/modules/opac/controllers/RechercheControllerTest.php
Please register or sign in to comment