Skip to content
Commit 7c0747eb authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'stable-3.1' into 'stable-3.1'

show ips only with vhost = y and  show directive_snippets for the admin even...

See merge request ispconfig/ispconfig3!929
parents b047ebde f0bfe454
Pipeline #1755 passed with stage
in 3 minutes and 1 second