Merge branch 'master' into 'master'

Marius Cramer

2015-07-07 c755f8131c38a3f0c5f97cf029959789aae133f3

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