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

Merge branch 'hotline-master'

Conflicts:
	VERSIONS
	library/startup.php
	tests/library/Class/CommSigbTest.php
parents 09b50026 592d9d7a
Branches
Tags
6 merge requests!1553Master,!1502Master,!1501Stable,!1472Stable,!1409Stable,!1397Master
Showing
with 80 additions and 16 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