Merge branch 'master' into 'master'

Marius Cramer

2015-08-16 3e783660d8cb49f6c5067baf4c7c3bbcd4975846

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