Merge branch 'master' into 'master'

Marius Burkard

2016-01-12 ee60c95a22aad82742bd9da439acd6ee8f0796af

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