Merge branch 'master' into 'master'

Marius Cramer

2015-09-13 1ec1fc69c4b550b15f3b04d2988e2138a5e22477

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