GitLab

Resolve "php 5.4 incompatibility array_column"

Closes #6231

See merge request ispconfig/ispconfig3!1524

Pre-Release 3.2.6

See merge request !1523

Resolve "Duplicate forwards must be allowed, revert for #6212"

Closes #6229

See merge request !1522

Fixed: Rewrite proxy for ssl targets

See merge request !1521

6181-fix-fpm-socket-dir:  Fix socket dir for additional php versions

Closes #6181

See merge request !1490

Add api functions for DNS type LOC, #6224

Closes #6224

See merge request !1519

Limit email backup tab through client limits (#5732)

Closes #5732

See merge request !1250

# Conflicts:
#   install/sql/incremental/upd_dev_collection.sql
#   install/sql/ispconfig3.sql
#   interface/web/client/form/client.tform.php
#   interface/web/client/form/client_template.tform.php
#   interface/web/client/form/reseller.tform.php
#   interface/web/client/lib/lang/br_client.lng
#   interface/web/client/lib/lang/br_client_template.lng
#   interface/web/client/lib/lang/br_reseller.lng
#   interface/web/client/templates/client_edit_limits.htm
#   interface/web/client/templates/client_template_edit_limits.htm
#   interface/web/client/templates/reseller_edit_limits.htm

Merge branch '6226-syntax-error-in-upd_0093-sql-causes-software_-tables-not-to-be-dropped' into 'develop'

Resolve "Syntax error in upd_0093.sql causes software_* tables not to be dropped"

Closes #6226

See merge request !1520

These were already listed in interface/web/dns/lib/remote.conf.php

Merge branch '6221-installer-doesn-t-account-for-dangling-symlinks-of-letsencrypt-hook-files' into 'develop'

Resolve "installer doesn't account for dangling symlinks of letsencrypt hook files"

Closes #6221

See merge request !1516

Missing asterisk for libnss*.so.*

See merge request !1518

Resolve "duplicate forwards allowed"

Closes #6212

See merge request !1513

Update jk_init.ini.master - incorporate upstream (v2.22) changes and glob match some pathnames

See merge request !1497

Resolve "chroot jail not created for chroot php-fpm mode website"

Closes #6209

See merge request !1504

Resolve "New SSL certificate code not migrated to nginx plugin"

Closes #6220

See merge request !1515

Resolve "CSR request not created or saved in ISPConfig 3.2.5"

Closes #6183

See merge request !1514

Resolve "improve letsencrypt renew hook"

Closes #6191

See merge request ispconfig/ispconfig3!1492