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

version 7.9.9 

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

# Conflicts:
#	VERSIONS
#	library/digital_resources/Lekiosk/CasLink.php
#	library/digital_resources/Lekiosk/Link.php
#	library/startup.php
#	tests/application/modules/opac/controllers/ModulesControllerTest.php
#	tests/library/Class/LeKioskLinkTest.php
parents 4e5335bf 458b6e60
4 merge requests!2334Master,!2102#57574 : correction orthographe des jours de la semaine,!2101Master,!2100Hotline master
Pipeline #993 passed with stage
in 18 minutes and 32 seconds
Hide whitespace changes
Inline Side-by-side
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