Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-03 03d03093c9ca77befa029931e089f8abac96d3bb

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