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

Merge branch 'hotline_6.51'

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	tests/application/modules/opac/controllers/CmsControllerTest.php
parents f1615161 2c63ad9c
Branches
Tags
1 merge request!393Master
Showing
with 490 additions and 224 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