Skip to content
Snippets Groups Projects
Commit 506b9080 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'afi-master' into afi-dev#13283_export_pret_unimarc

Conflicts:
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
parents 15900137 83164a89
Branches
Tags
3 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!108Dev#13283 Export Pret Unimarc,!99Dev#13283 Export Pret Unimarc
Showing
with 311 additions and 103 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