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

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
	public/admin/css/global.css
parents 772b51e5 9fbf8d26
1 merge request!1797Master
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