Skip to content
Snippets Groups Projects
Commit 203c84ee authored by Laurent's avatar Laurent
Browse files

Merge branch 'origin-stable' into origin-hotline-master 

Conflicts:
	VERSIONS
	library/startup.php
	tests/application/modules/opac/controllers/AbonneControllerSuggestionAchatTest.php
parents c4f2161b 4676ebb7
2 merge requests!1132Hotline#29412 images des articles dans le resultat de recherche,!1120Master
Hide whitespace changes
Inline Side-by-side
Showing
with 143 additions and 20 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