Merge branch 'master' into 'master'

Marius Cramer

2015-08-21 98d600f476f4aaf7d4b348ae59e468a96a7801eb

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