Merge branch 'master' into 'master'

Marius Cramer

2015-06-02 6f2d95f4f36043e38b14599f5878af320566f8f4

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