Merge branch 'master' into 'master'

Marius Cramer

2015-09-03 e10d34abca22c0d18759c536dd5ba1bca9705734

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