Merge branch 'master' into 'master'

Marius Cramer

2015-08-23 8a77a74e1a7a31196541691fce711bdcebaa1d2e

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