Merge branch 'bweston/ispconfig3-feature/use-contributing-file' into stable...

Marius Burkard

2016-03-02 65ee075f32c58e35d3b660006bceaad9f6a2a4d8

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