Skip to content
Snippets Groups Projects
Commit 41dd2a9f authored by gloas's avatar gloas
Browse files

Merge remote-tracking branch 'origin/hotline_6.44'

Conflicts:
	VERSIONS
	library/startup.php

* VERSIONS:
parents a69cb984 e7d8e10f
Branches
Tags
3 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!180Master,!152Dev#13060 Amelioration Formulaire Inscription
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