Merge branch 'master' into 'master'

Marius Cramer

2015-11-12 8ce5e3054e6bc70cc44e8d2d002ac035f02bd9ec

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