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

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
parents 2ba2b2df 9848e1f2
Branches
Tags 7.1.26
No related merge requests found
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