Revert "Merge pull request #326 from Churro/froxlorMerge_vhostTemplates"

This reverts commit 319668d384, reversing
changes made to aa592c7369.

Conflicts:
	install/froxlor.sql
	install/updates/froxlor/0.9/update_0.9.inc.php
	lib/version.inc.php
This commit is contained in:
Michael Kaufmann (d00p)
2016-03-03 23:31:19 +01:00
parent ca807583df
commit f6e519d779
10 changed files with 128 additions and 126 deletions

View File

@@ -858,6 +858,5 @@ CREATE TABLE IF NOT EXISTS `panel_vhostconfigs` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`description` varchar(50) NOT NULL,
`vhostsettings` text NOT NULL,
`webserver` varchar(255) NOT NULL default '',
PRIMARY KEY (`id`)
) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;