Merge branch 'fs3933' into 'master'

Marius Cramer

2015-08-05 92edaf22dd892540ebf5a415464c6434ce72fb20

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