Merge branch 'master' into 'master'

Marius Cramer

2015-10-22 796661c563939605d8c7ba7e01b7ecf62f9cd1cf

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