Skip to content
Snippets Groups Projects
Commit 387d9fa7 authored by Laurent's avatar Laurent
Browse files

Merge branch 'hotline-master' 

# Conflicts:
#	library/Class/MoteurRecherche.php
#	library/Class/WebService/Vignette.php
#	tests/application/modules/opac/controllers/RechercheControllerTest.php
#	tests/library/Class/NoticeTest.php
parents 1db7e640 73e1309b
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 874 additions and 531 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