Skip to content
Snippets Groups Projects
Commit 403e5677 authored by gloas's avatar gloas
Browse files

Merge branch 'hotline_6.50' 

Conflicts:
	VERSIONS
	cosmogramme/php/classes/classe_notice_integration.php
parents 267c52db 231a8ac3
Branches
Tags
4 merge requests!366Master,!365Master,!364Master,!363Master
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 756 additions and 646 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