Skip to content
Snippets Groups Projects
Commit e7b35ada authored by Laurent's avatar Laurent
Browse files

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
	tests/library/Class/UrlTest.php
parents 0c21ee71 128baa04
Branches
Tags
1 merge request!2334Master
Pipeline #1534 passed with stage
in 10 minutes and 51 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