Merge branch 'stable' into hotline-master
Conflicts: VERSIONS library/startup.php tests/library/ZendAfi/MailTest.php
Branches
Tags
Showing
- VERSIONS 22 additions, 4 deletionsVERSIONS
- VERSIONS_HOTLINE/29412 0 additions, 1 deletionVERSIONS_HOTLINE/29412
- VERSIONS_HOTLINE/29622 0 additions, 1 deletionVERSIONS_HOTLINE/29622
- VERSIONS_HOTLINE/29633 0 additions, 1 deletionVERSIONS_HOTLINE/29633
- application/modules/admin/views/scripts/head.phtml 1 addition, 0 deletionsapplication/modules/admin/views/scripts/head.phtml
- application/modules/admin/views/scripts/index/index.phtml 6 additions, 3 deletionsapplication/modules/admin/views/scripts/index/index.phtml
- cosmogramme/tests/php/classes/NoticeIntegrationDedupTest.php 59 additions, 1 deletioncosmogramme/tests/php/classes/NoticeIntegrationDedupTest.php
- cosmogramme/tests/php/classes/unimarc_mulhouse_remanence.txt 1 addition, 0 deletionscosmogramme/tests/php/classes/unimarc_mulhouse_remanence.txt
- library/Class/AdminVar.php 1 addition, 1 deletionlibrary/Class/AdminVar.php
- library/Class/CosmoVar.php 1 addition, 0 deletionslibrary/Class/CosmoVar.php
- library/Class/Cosmogramme/Integration/PhaseNotice.php 3 additions, 0 deletionslibrary/Class/Cosmogramme/Integration/PhaseNotice.php
- library/ZendAfi/Mail.php 41 additions, 31 deletionslibrary/ZendAfi/Mail.php
- library/startup.php 5 additions, 1 deletionlibrary/startup.php
- public/opac/js/responsive.js 2 additions, 2 deletionspublic/opac/js/responsive.js
- tests/application/modules/admin/controllers/IndexControllerTest.php 18 additions, 0 deletions...ication/modules/admin/controllers/IndexControllerTest.php
- tests/library/Class/AdminVarTest.php 10 additions, 0 deletionstests/library/Class/AdminVarTest.php
- tests/library/Class/Cosmogramme/Integration/PhaseNoticeTest.php 20 additions, 0 deletions...library/Class/Cosmogramme/Integration/PhaseNoticeTest.php
- tests/library/ZendAfi/MailTest.php 24 additions, 0 deletionstests/library/ZendAfi/MailTest.php
Please register or sign in to comment