Merge branch 'bash' into 'master'

Marius Cramer

2015-06-05 1fa1bcead3a1fc02c1ff81732ce0e561df64822b

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