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

Merge branch 'master' into 'master' 

Fix for #4335 and removal of unnecessary file

See merge request ispconfig/ispconfig3!706
parents c31eeea0 b22ec4ad
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