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

Merge branch 'origin-hotline_6.45'

Conflicts:
	VERSIONS
parents e1d5cdbe 41496d26
4 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!215Dev#12992 Custom Fields,!209Hotline#13914 Album Link Config Menu,!189Dev#1278 Autoupdate Cosmogramme Script
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