Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

Marius Cramer

2013-12-27 6b1d788d1d50fd38f68f152285f3fa816a9d7880

1
ALTER TABLE `web_domain` ADD `php_fpm_use_socket` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `nginx_directives`;