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

Merge branch 'dev#32668_contenu_bibliotheques_sandbox_gladys_hackfest' into... 

Merge branch 'dev#32668_contenu_bibliotheques_sandbox_gladys_hackfest' into dev#32668_bib_form_custom_fields

Conflicts:
	library/Class/Bib.php
parents 3f65de11 c259b3b7
Branches
Tags
8 merge requests!1587Master,!1553Master,!1539Master,!1534Dev#32668 bib form custom fields refacto master,!1532Dev#37314 bibliotheque mode d affichage un champ saisi un bloc a styliser dans la charte,!1507Form custom fields refacto,!1488Dev#37314 bibliotheque mode d affichage un champ saisi un bloc a styliser dans la charte,!1475Dev#32668 bib form custom fields
Hide whitespace changes
Inline Side-by-side
Showing
with 617 additions and 204 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