Merge branch 'master' into 'master'

Marius Cramer

2015-07-21 de34a9d7754c9f8b6e8af4334b3950dc886ad064

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