Merge branch 'master' into 'master'

Marius Cramer

2015-09-12 6cdb029df901248cf6f9bbd74586cc6f62051fee

1
ALTER TABLE `client` CHANGE `company_id` `company_id` VARCHAR( 255 ) NULL DEFAULT NULL ;