Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2015-05-07 be531cf1d37d2293a572eef25d0190e23fc8a3b4

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