Merge branch 'letsencrypt-alias' into 'stable-3.1'

Marius Burkard

2016-07-04 67f562d6772e032e72a6fe11a2cf2a90fd62b73b

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