Skip to content
Commit 3b0546fc authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'pixcept/ispconfig3-mods-new-layout-3.1' 

Conflicts:
	interface/web/admin/templates/directive_snippets_list.htm
	interface/web/sites/templates/web_vhost_domain_ssl.htm
parents 8173c6f2 89e4329a
Hide whitespace changes
Inline Side-by-side
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