Merge branch 'master' into 'master'

Marius Cramer

2014-10-11 b98be2e5bcd1abfb98a544fdad66696007925b38

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