summaryrefslogtreecommitdiff
path: root/changelog.d
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2024-09-16 11:51:22 -0400
committerMark Felder <feld@feld.me>2024-09-16 11:51:22 -0400
commite24e107f3d3ae6024068c6509a7cb0582ea4bf02 (patch)
tree902c179c947643e520579d49b80480eef86e2495 /changelog.d
parente59706c201bd71525c0a15008c3cb5dcdfb73289 (diff)
parent3a0d4e98374d77fd6721034362677984b97d2cab (diff)
downloadpleroma-e24e107f3d3ae6024068c6509a7cb0582ea4bf02.tar.gz
pleroma-e24e107f3d3ae6024068c6509a7cb0582ea4bf02.zip
Merge remote-tracking branch 'origin/develop' into retry-tests
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/ldap-ca.add1
-rw-r--r--changelog.d/ldaps.fix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/ldap-ca.add b/changelog.d/ldap-ca.add
new file mode 100644
index 000000000..32ecbb5c0
--- /dev/null
+++ b/changelog.d/ldap-ca.add
@@ -0,0 +1 @@
+LDAP configuration now permits overriding the CA root certificate file for TLS validation.
diff --git a/changelog.d/ldaps.fix b/changelog.d/ldaps.fix
new file mode 100644
index 000000000..a1dc901ab
--- /dev/null
+++ b/changelog.d/ldaps.fix
@@ -0,0 +1 @@
+LDAPS connections (implicit TLS) are now supported.