summary refs log tree commit diff
path: root/changelog.d/3704.misc
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-24 23:42:25 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-09-24 23:42:25 +1000
commit04eed80a73add90b5591fa5943648402dcd5bcaf (patch)
treea84f7bfee019b7ad0e79637bba015777ae663461 /changelog.d/3704.misc
parentMerge pull request #3927 from matrix-org/erikj/handle_background_errors (diff)
parentMerge tag 'v0.33.5' (diff)
downloadsynapse-04eed80a73add90b5591fa5943648402dcd5bcaf.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'changelog.d/3704.misc')
-rw-r--r--changelog.d/3704.misc1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/3704.misc b/changelog.d/3704.misc
deleted file mode 100644
index aaae0fbd63..0000000000
--- a/changelog.d/3704.misc
+++ /dev/null
@@ -1 +0,0 @@
-CircleCI tests now run on the potential merge of a PR.