Merge branch 'mergebranch'

Marius Burkard

2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5

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