summary refs log tree commit diff
path: root/.circleci
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-03-02 16:55:55 +0000
committerErik Johnston <erik@matrix.org>2020-03-02 16:55:55 +0000
commit65a941d1f8e4a27c56ad015369219a2e7c577a01 (patch)
tree442d9e11867521f021b3cb05531af9c446d7c4ef /.circleci
parentFix worker handling (diff)
parentAlways return a deferred from `get_current_state_deltas`. (#7019) (diff)
downloadsynapse-65a941d1f8e4a27c56ad015369219a2e7c577a01.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devices_stream
Diffstat (limited to '.circleci')
0 files changed, 0 insertions, 0 deletions