Merge branch 'feature/git-attributes' into 'stable-3.1'

Marius Burkard

2016-03-02 1325b11714cddb3be557aee5c3ec03f29cee69f4

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