summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2019-05-13 15:37:03 +0100
committerDavid Baker <dave@matrix.org>2019-05-13 15:37:03 +0100
commit9e99143c47f8eca30c36aa9b6312b991a969cf1a (patch)
tree8d839e28e9276baa255bed3c0cf1d25f43eac2ec /changelog.d
parentAnd now I realise why the test is failing... (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-9e99143c47f8eca30c36aa9b6312b991a969cf1a.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_recaptcha_only
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/5155.misc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/5155.misc b/changelog.d/5155.misc
new file mode 100644
index 0000000000..a81dbae67a
--- /dev/null
+++ b/changelog.d/5155.misc
@@ -0,0 +1 @@
+Prevent an exception from being raised in a IResolutionReceiver and use a more generic error message for blacklisted URL previews.
\ No newline at end of file