Skip to content
Snippets Groups Projects
Commit f6a67467 authored by Florian Schaal's avatar Florian Schaal
Browse files

Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop

parents 0df7c5fd 1fa2dfbc
No related branches found
No related tags found
1 merge request!1386allow custom rspamd url (Implements #6010) use idn_decode for mailuser and login fails for mail-users with IDN domains (Fixes #6021) wrong server-id in admin/server_config_edit.php (Fixes #6022)
Showing
with 199 additions and 129 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment