Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Marius Burkard

2016-06-22 19478d5633fc83c5b6004d29a7602d0dbbef9de0

1
ALTER TABLE `directive_snippets` ADD `master_directive_snippets_id` int(11) unsigned NOT NULL DEFAULT '0' AFTER `active`;