Merge branch 'nginx_apps.vhost.master_mailman' into 'stable-3.1'

Marius Burkard

2016-03-08 50ff38746a983db3d4369605f5fd5508efa37d17

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