Merge branch 'master' into 'master'

Marius Cramer

2015-03-06 39a2d33c4680fe0a0fcd10e864d075f520d9905e

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