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

Merge remote-tracking branch 'origin/form_custom_fields_refacto' into...

Merge remote-tracking branch 'origin/form_custom_fields_refacto' into dev#32668_bib_form_custom_fields_refacto_master

Conflicts:
	VERSIONS
	library/Class/Bib.php
	library/Trait/CustomFields.php
	library/startup.php
parents ddd21346 087dbbe9
Branches
Tags
4 merge requests!1587Master,!1553Master,!1539Master,!1534Dev#32668 bib form custom fields refacto master
Showing
with 381 additions and 173 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