Merge branch 'html_welcome_mail' into 'stable-3.1'

Marius Burkard

2016-02-06 bc3a7750c366d22ac69561d645312b794b312b84

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;