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

Till Brehm

2014-12-11 6935aa30cb402e25335ba730ee5657f6020c7cc5

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