Merge branch 'stable-3.1'

Marius Burkard

2016-02-17 aef2832197d4627cf87fdd5ebf69b25c68a411a7

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