# Conflicts:
#   interface/web/mail/lib/lang/ar_mail_user.lng
#   interface/web/mail/lib/lang/bg_mail_user.lng
#   interface/web/mail/lib/lang/br_mail_user.lng
#   interface/web/mail/lib/lang/ca_mail_user.lng
#   interface/web/mail/lib/lang/cn_mail_user.lng
#   interface/web/mail/lib/lang/cz_mail_user.lng
#   interface/web/mail/lib/lang/de_mail_user.lng
#   interface/web/mail/lib/lang/dk_mail_user.lng
#   interface/web/mail/lib/lang/el_mail_user.lng
#   interface/web/mail/lib/lang/en_mail_user.lng
#   interface/web/mail/lib/lang/es_mail_user.lng
#   interface/web/mail/lib/lang/fi_mail_user.lng
#   interface/web/mail/lib/lang/fr_mail_user.lng
#   interface/web/mail/lib/lang/hr_mail_user.lng
#   interface/web/mail/lib/lang/hu_mail_user.lng
#   interface/web/mail/lib/lang/id_mail_user.lng
#   interface/web/mail/lib/lang/it_mail_user.lng
#   interface/web/mail/lib/lang/ja_mail_user.lng
#   interface/web/mail/lib/lang/nl_mail_user.lng
#   interface/web/mail/lib/lang/pl_mail_user.lng
#   interface/web/mail/lib/lang/pt_mail_user.lng
#   interface/web/mail/lib/lang/ro_mail_user.lng
#   interface/web/mail/lib/lang/ru_mail_user.lng
#   interface/web/mail/lib/lang/se_mail_user.lng
#   interface/web/mail/lib/lang/sk_mail_user.lng
#   interface/web/mail/lib/lang/tr_mail_user.lng
#   interface/web/mail/mail_user_edit.php

Show aliases in mail user edit form, #6553

Closes #6553

See merge request ispconfig/ispconfig3!1785

Resolve "manually added DKIM key creates empty DNS RR"

Closes #6610

See merge request ispconfig/ispconfig3!1830

De-duplicate onBeforeUpdate and onBeforeInsert

Closes #6625

See merge request ispconfig/ispconfig3!1836

Preserve other DKIM keys while updating, #6688

Closes #6688

See merge request ispconfig/ispconfig3!1881

Performance backup garbage collection potentially tries to delete same file multiple times

See merge request ispconfig/ispconfig3!1885

Misc updates

See merge request ispconfig/ispconfig3!1835

# Conflicts:
#   interface/lib/lang/de.lng

proposal Fix #6692 and #2962 add backup interval setting for databases

Closes #2962 and #6692

See merge request ispconfig/ispconfig3!1886

Resolve "Probable bug on roundcube default Content-Security-Policy"

Closes #6659

See merge request ispconfig/ispconfig3!1901

Add support for Ubuntu 24.04

Closes #6673

See merge request ispconfig/ispconfig3!1900

Use new http2 directive for Nginx versions > 1.25.0

See merge request ispconfig/ispconfig3!1891

Sync common code between shelluser_jailkit_plugin and shelluser_base_plugin

See merge request ispconfig/ispconfig3!1898

* Fix intentions
* Only set TLS 1.3 template var and print the debug message if SSL is activated

Allow for a dbmaster to be on the same host but different port, #6691

See merge request ispconfig/ispconfig3!1896

Add an option to disable the symlink restriction "SymLinksIfOwnerMatch" for...

Closes #6700

See merge request ispconfig/ispconfig3!1897

Fix php 8 compatibility warnings, #6698

See merge request ispconfig/ispconfig3!1895

Misc German translation updates

See merge request ispconfig/ispconfig3!1894