Merge branch 'stable-3.1'

Marius Burkard

2016-02-18 c59ab58240bedf431567e206a71a6ad62a106441

1
ALTER TABLE `web_domain` ADD `document_root_www` VARCHAR( 255 ) NULL AFTER `document_root`;