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

Merge branch 'stable'

Conflicts:
	VERSIONS
	library/startup.php
parents 642c45cc 9b4b90a8
Branches
Tags
2 merge requests!1896Master,!1866Hotline 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