summary refs log tree commit diff
path: root/changelog.d/3858.misc
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-14 00:44:31 +1000
committerGitHub <noreply@github.com>2018-09-14 00:44:31 +1000
commit3126b88d35994b09096239462abbbbcd17d9cbf0 (patch)
tree5a022255a93a48535890ec5eb3e18c56c267aada /changelog.d/3858.misc
parentAttempt to figure out what's going on with timeouts (#3857) (diff)
downloadsynapse-3126b88d35994b09096239462abbbbcd17d9cbf0.tar.xz
fix circleci merged builds (#3858)
* fix

* changelog
Diffstat (limited to 'changelog.d/3858.misc')
-rw-r--r--changelog.d/3858.misc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/3858.misc b/changelog.d/3858.misc
new file mode 100644
index 0000000000..4644db5330
--- /dev/null
+++ b/changelog.d/3858.misc
@@ -0,0 +1 @@
+Fix running merged builds on CircleCI
\ No newline at end of file