Skip to content
Snippets Groups Projects
Commit bdff01a4 authored by Laurent's avatar Laurent
Browse files

Merge branch 'origin-hotline_6.41' 

Conflicts:
	library/Class/NoticeHtml.php
parents 08be9e8d 37b68074
Branches
Tags
2 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!93Master
Hide whitespace changes
Inline Side-by-side
Showing
with 505 additions and 229 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