Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-06-16 e674659333619b155abf9e946a56e48d42861c22

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