Skip to content
Commit 0db3ec53 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch '3.2.12p1' into 'develop' 

Merge changes from 3.2.12p1 into develop

Closes #6754, #6755, and #6727

See merge request ispconfig/ispconfig3!1941
parents 29c4115d 264129f6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment