Merge branch 'master' into 'master'

Marius Cramer

2015-11-17 fe9b73c387c396036a272daa39a809ed02980563

1
2
3
-- --------------------------------------------------------
 
ALTER TABLE `web_domain` ADD `web_folder` VARCHAR( 100 ) DEFAULT NULL AFTER `document_root` ;