Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-05-12 f1634087ea8a852b58ec13d5099e94771ed80849

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