summary refs log tree commit diff
path: root/changelog.d/4284.bugfix
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-09 15:00:46 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-09 15:00:46 +0000
commitd566e6b17ab1a1bcd390188368d111fb4899b918 (patch)
tree7088a92417b10e3288c4d3b8359141cd39bf0924 /changelog.d/4284.bugfix
parentMerge pull request #4368 from matrix-org/erikj/better_errors (diff)
parent0.34.1 (diff)
downloadsynapse-d566e6b17ab1a1bcd390188368d111fb4899b918.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d/4284.bugfix')
-rw-r--r--changelog.d/4284.bugfix1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/4284.bugfix b/changelog.d/4284.bugfix
deleted file mode 100644
index 4a9478fa28..0000000000
--- a/changelog.d/4284.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add 'sandbox' to CSP for media reprository