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

7.5.16

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
parents 40b6a0e6 3f74fe27
Branches
Tags
2 merge requests!1659Master,!1587Master
Showing
with 183 additions and 97 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