# Conflicts:
#   install/sql/incremental/upd_dev_collection.sql

select Move to Junk before/after custom filters

See merge request ispconfig/ispconfig3!1058

# Conflicts:
#   interface/web/mail/lib/lang/ar_mail_user.lng
#   interface/web/mail/lib/lang/bg_mail_user.lng
#   interface/web/mail/lib/lang/cz_mail_user.lng
#   interface/web/mail/lib/lang/en_mail_user.lng
#   interface/web/mail/lib/lang/fi_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

email account forward

See merge request ispconfig/ispconfig3!1009

Resolve "Crontab deletion after website removal"

See merge request ispconfig/ispconfig3!1069

- disallow several folders for vhost subdomains and aliasdomains

See merge request ispconfig/ispconfig3!1067

# Conflicts:
#   install/sql/incremental/upd_dev_collection.sql

Resolve "MariaDB: Field 'nginx_directives' doesn't have a default value"

See merge request ispconfig/ispconfig3!1070

Resolve "Directories of sub- or aliasdomains (vhost) owned by root"

See merge request ispconfig/ispconfig3!1066

Resolve "mailman images not showing [nginx fix]"

See merge request ispconfig/ispconfig3!1065

change cc and sender_cc column type

See merge request ispconfig/ispconfig3!1052

Resolve "IDN encode domains in Rspamd config file names"

See merge request ispconfig/ispconfig3!1062

Resolve "Enable logging for acme.sh"

See merge request ispconfig/ispconfig3!1063

Resolve "Improve FCGI starter scripts"

See merge request ispconfig/ispconfig3!1064

Db remote server & dns slave fix

See merge request ispconfig/ispconfig3!863

# Conflicts:
#   install/sql/incremental/upd_dev_collection.sql

This reverts commit 0d61c249