version 7.1.15
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master # Conflicts: # VERSIONS # library/startup.php
Showing
- VERSIONS 9 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/22055 0 additions, 1 deletionVERSIONS_HOTLINE/22055
- application/modules/push/controllers/MultimediaController.php 1 addition, 3 deletions...ication/modules/push/controllers/MultimediaController.php
- library/Class/Multimedia/Users.php 35 additions, 35 deletionslibrary/Class/Multimedia/Users.php
- library/Class/UserGroup.php 1 addition, 1 deletionlibrary/Class/UserGroup.php
- library/ZendAfi/View/Helper/TagTitreEtNombreDeResultats.php 6 additions, 6 deletionslibrary/ZendAfi/View/Helper/TagTitreEtNombreDeResultats.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/opac/controllers/RechercheControllerTest.php 5 additions, 2 deletions...tion/modules/opac/controllers/RechercheControllerTest.php
Please register or sign in to comment