Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-30 5e981c0c36166071298a6b82cead9f81310842ab

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