Skip to content
Snippets Groups Projects
Commit 629aced6 authored by Patrick Barroca's avatar Patrick Barroca
Browse files

Merge remote-tracking branch 'refs/remotes/origin/master' into... 

Merge remote-tracking branch 'refs/remotes/origin/master' into hotline#46123_pb_acces_a_la_bib_numerique_par_les_administrateurs_bibliotheques

Conflicts:
	library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
parents bb16c9d7 7968799b
5 merge requests!1803Master,!1797Master,!1793Master,!1792Stable,!1788Hotline#46123 pb acces a la bib numerique par les administrateurs bibliotheques
Hide whitespace changes
Inline Side-by-side
Showing
with 127 additions and 387 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