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

Merge branch 'origin-hotline' into origin-master

# Conflicts:
#	tests/scenarios/Templates/TemplatesMenuTest.php
parents bfadf610 0b98559f
Branches
Tags
Pipeline #14474 passed with stage
in 51 minutes and 47 seconds
Showing
with 441 additions and 58 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