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

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
parents 0b18bcff a1560cd2
Branches
Tags
Showing with 147 additions and 26 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