Skip to content
Commit 33e608ba authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch '842-dev' into 'develop' 

Backport from !842

See merge request ispconfig/ispconfig3!1162
parents 50ec6a6c bc1a2d61
Pipeline #4990 passed with stage
in 12 seconds