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

Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master

Conflicts:
	tests/application/modules/admin/controllers/AccueilControllerConteneurDeuxColonnesTest.php
parents abdca573 09e0bb4d
Branches
Tags
Pipeline #1644 failed with stage
in 13 minutes and 50 seconds
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