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

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
parents 5a13730a 4e8ac510
Branches
Tags 7.5.17
No related merge requests found
Showing
with 316 additions and 185 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