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

Merge remote-tracking branch 'renky/vhostalias' 

Conflicts:
	interface/web/sites/web_aliasdomain_edit.php
parents 20e30b45 f902e3bd
Show 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