# Conflicts:
#   interface/web/login/index.php

Resolve "Port apps.vhost from install/ to server/"

Closes #6321

See merge request !1592

Merge branch '6314-only-add-mailman-related-config-to-the-postfix-config-if-mailman-is-installed' into 'develop'

Resolve "Only add Mailman related config to the Postfix config if Mailman is installed"

Closes #6314

See merge request !1633

Fixed issue #6389 mail server not configured correctly

Closes #6389

See merge request !1637

Add a default_country config option

Closes #4127

See merge request !1618

apps: Increase PHP post and upload limit to 100M.  See #6381

Closes #6381

See merge request !1629

Merge branch '6383-ah00548-namevirtualhost-has-no-effect-and-will-be-removed-in-the-next-release-etc-apache2' into 'develop'

Resolve "AH00548: NameVirtualHost has no effect and will be removed in the next release /etc/apache2/sites-enabled/000-ispconfig.vhost:7"

Closes #6383

See merge request !1634

Resolve "hide stderr from which(1) on centos"

Closes #6316

See merge request !1635

Rename Mailman data directory if it exists and Mailman is not installed to prevent broken routes (#6314)

Fix mailuser login, closes #6380

Closes #6380

See merge request !1627

Set a default for newly created users to be active, fixes #6369

Closes #6369

See merge request ispconfig/ispconfig3!1620

Allows Apache2 + PHP-FPM to interpret PHP files in /var/www/example.com/web, #6335

Closes #6335

See merge request !1603

Add bind_keyfiles_dir config option

See merge request !1375

Add an option to disable automatic creation of CAA record on issuing LE

Closes #6372

See merge request ispconfig/ispconfig3!1624

Added support for leading dots in amavis wildcard user lookups

Closes #5533

See merge request ispconfig/ispconfig3!1613

Resolve "Notifications to reseller not working"

Closes #6347

See merge request ispconfig/ispconfig3!1610

Resolve "SPF modification error with user account"

Closes #5481

See merge request ispconfig/ispconfig3!1612

Safe delete for mailboxes

Closes #6113

See merge request ispconfig/ispconfig3!1454

Delete mail_domain after mail_user records

Closes #6331

See merge request ispconfig/ispconfig3!1598

nginx: Added ACME redirect to main domain based on alias domain fix

Closes #4618

See merge request !1604

Also cleanup databases when a client is deleted, fixes #6304

Closes #6304

See merge request ispconfig/ispconfig3!1596

Resolve "Lower the entropy test value in BIND plugin to 200"

Closes #6366

See merge request ispconfig/ispconfig3!1619

Show the client name on the delete confirmation page

Closes #6334

See merge request ispconfig/ispconfig3!1601

Warn about duplicate code in a comment

See merge request ispconfig/ispconfig3!1597

Backport MR !889, unify settings between distros and improves

See merge request ispconfig/ispconfig3!1609

Change deprecated JQuery .load() to .on("load") - #6322

Closes #6322

See merge request ispconfig/ispconfig3!1607

Resolve "API to get mail user details for all account that belong to a domain"

Closes #6333

See merge request !1600

Add API function mail_user_get_all_by_client, #6332

Closes #6332

See merge request ispconfig/ispconfig3!1599

Added user field to datalog list view

Closes #6370

See merge request !1621