Merge branch 'master' into 'master'

Marius Burkard

2015-12-13 d240f6d285ea4696b087763d99089591cb02fcfd

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