Merge remote-tracking branch 'origin/hotline_6.44'
Conflicts: VERSIONS library/startup.php * VERSIONS:
Branches
Tags
Showing
- VERSIONS 13 additions, 5 deletionsVERSIONS
- library/Class/NoticeUnimarc/Writer.php 2 additions, 16 deletionslibrary/Class/NoticeUnimarc/Writer.php
- library/startup.php 2 additions, 5 deletionslibrary/startup.php
- tests/application/modules/opac/controllers/AbonneControllerPretsTest.php 14 additions, 6 deletions...on/modules/opac/controllers/AbonneControllerPretsTest.php
Please register or sign in to comment