Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 dfadc85817ae71a7a9bff48ae74bb7293df0d58e

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