Merge branch 'master' into 'master'

Marius Cramer

2015-07-02 f3ff1e4ba5174dd559890483dd7dded8a04c10fd

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