Skip to content
Snippets Groups Projects
Commit c87f9166 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch... 

Merge branch 'dev#40126_story_4_bibliotheque_rechercher_une_bibliotheque_avec_filtres_demande_fille'

Conflicts:
	library/Class/Bib.php
parents f27e046f 557d09f6
Branches
Tags
4 merge requests!1659Master,!1618Master,!1610Dev#35088 oai import in cosmogramme,!1595Master
Hide whitespace changes
Inline Side-by-side
Showing
with 515 additions and 429 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