Merge branch 'stable-3.1'

Marius Burkard

2016-03-23 f964bf7e7403578e787ce5519d9e63c074967242

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