Merge branch 'hide_client' into 'master'

Marius Cramer

2014-07-09 8164cdd8c7f87d977ec35738ca121c7fc6e1cb2e

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