Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-05-06 0ebe6194791bdf59f85b1037a6a43327ac199fe4

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