diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-09-17 13:45:15 +0200 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-09-17 13:45:15 +0200 |
| commit | 76cfc6127fa05a8c5214d1dff368bad0e0a0b1a8 (patch) | |
| tree | 5a63ebd265d8fa97f677e5f86dbb1de776f60936 /changelog.d | |
| parent | 309d22aca2ec0557b27c8e3d8d12b088061e0142 (diff) | |
| parent | e7176bb998a7e20f2bb3c9f32e1e2dfe8c3cd818 (diff) | |
| download | pleroma-76cfc6127fa05a8c5214d1dff368bad0e0a0b1a8.tar.gz pleroma-76cfc6127fa05a8c5214d1dff368bad0e0a0b1a8.zip | |
Merge remote-tracking branch 'origin/develop' into ensure-authorized-fetch
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/fix-test-failures.skip | 0 | ||||
| -rw-r--r-- | changelog.d/ldap-ca.add | 1 | ||||
| -rw-r--r-- | changelog.d/ldaps.fix | 1 |
3 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/fix-test-failures.skip b/changelog.d/fix-test-failures.skip deleted file mode 100644 index e69de29bb..000000000 --- a/changelog.d/fix-test-failures.skip +++ /dev/null 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. |