Merge branch 'master' into 'master'

Marius Cramer

2015-11-11 64604dedaf7ff5c86db5e5e7d82de62ba3a1df2c

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