Skip to content
Snippets Groups Projects
Commit ee45b993 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'develop' into 'develop' 

allow 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)

Closes #6022, #6021, and #6010

See merge request !1386
parents 3118c93b bd660233
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 35 additions and 19 deletions
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