Skip to content
Snippets Groups Projects
Commit 042c5e5f authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

version 7.1.36

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	application/modules/admin/controllers/IndexController.php
#	library/Class/WebService/BibNumerique/Numilog/LivreNumerique.php
#	library/Class/WebService/BibNumerique/RessourceNumerique.php
#	library/Class/WebService/OAI.php
#	library/ZendAfi/View/Helper/Accueil/Kiosque.php
#	library/startup.php
#	tests/application/modules/admin/controllers/AdminIndexControllerTest.php
#	tests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php
parents 794bda72 585e60cd
Branches
Tags
2 merge requests!915Master,!914Hotline master
Showing
with 297 additions and 103 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment