Commit 3ce6d765 authored by Till Brehm's avatar Till Brehm

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

parents dfe37d72 d5896530
Pipeline #1983 passed with stage
in 2 minutes and 35 seconds