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

Merge branch 'afi-master' into afi-hotline_6.42 

Conflicts:
	library/Class/Exemplaire.php

+ test fixture compatibility with new 995 field serialization format
parents 87d5d1ec c956c475
Branches
Tags
3 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!114Master,!109Hotline 6.42
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 963 additions and 1691 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