Skip to content
Snippets Groups Projects
Commit 52d159ea authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'hotline#13564_integration_notices_casqy' of... 

Merge branch 'hotline#13564_integration_notices_casqy' of git.afi-sa.fr:afi/opacce into origin-hotline_6.44

Conflicts:
	VERSIONS
parents 7bd6f070 6f7206cd
4 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!180Master,!157Master,!145Hotline 6.44
Expand all Hide whitespace changes
Inline Side-by-side
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