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

Merge branch 'origin-hotline' into origin-master

# Conflicts:
#	tests/scenarios/Templates/TemplatesAbonneTest.php
parents f7b6272d 833502cd
Branches
Tags
1 merge request!4289Hotline
Pipeline #15392 failed with stage
in 1 minute and 5 seconds