Merge branch 'develop' into add-strike-support

matrix-org · Sep 2, 2024 · 992984c · 992984c
2 parents d84ce8c + 83e86ab
commit 992984c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/1812.bugfix b/changelog.d/1812.bugfix
@@ -0,0 +1 @@
+Comment out tlsOptions property in sample config.
diff --git a/config.sample.yaml b/config.sample.yaml
@@ -87,7 +87,7 @@ ircService:
       # Usually this should be off. Default: false.
       allowExpiredCerts: false
       # Set additional TLS options for the connections to the IRC server.
-      tlsOptions:
+      #tlsOptions:
         # A specific CA to trust instead of the default CAs. Optional.
         #ca: |
         #  -----BEGIN CERTIFICATE-----