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

Merge branch 'stable' into hotline-master 

Conflicts:
	VERSIONS
	library/startup.php
parents 8bbe01cb 1fefe7fe
Branches
Tags
No related merge requests found
Pipeline #2704 canceled with stage
in 4 minutes and 55 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 486 additions and 114 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