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

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
parents bfaba45c ae088c56
Branches
Tags
3 merge requests!715Master,!692Master,!691Hotline master
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