Skip to content
Snippets Groups Projects
Commit bed1eec8 authored by efalcy's avatar efalcy
Browse files

Merge branch 'origin-master' into origin-sandbox_fusion_search_result_and_print 

Conflicts:
	tests/application/modules/opac/controllers/RechercheControllerTest.php
parents 2c1b8843 e4d4f3db
Branches
Tags
5 merge requests!1132Hotline#29412 images des articles dans le resultat de recherche,!1120Master,!1079Dev #17782 merge print fusion,!1073Dev#17782 bonus 1 imprimer la liste des notices,!1062Sandbox fusion search result and print
Hide whitespace changes
Inline Side-by-side
Showing
with 529 additions and 294 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