Commit dba72bf3 authored by Antoine Catton's avatar Antoine Catton
Browse files

Merge branch 'master' into wprtubackup

Conflicts:
	component/mariadb/buildout.cfg
	component/stunnel/buildout.cfg
	slapos/recipe/mysql/template/my.cnf.in
parents 60f410dc 6ada966b
Supports Markdown
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