summary refs log tree commit diff
path: root/.circleci
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-29 22:00:33 +0000
committerErik Johnston <erik@matrix.org>2019-01-29 22:00:33 +0000
commita696c48133d9f9a94f8b078aeacce0bef0d693b4 (patch)
tree8137f14c734d351f52af038265103f275276646a /.circleci
parentUpdate synapse/storage/events_worker.py (diff)
parentMerge pull request #4483 from matrix-org/erikj/event_v2 (diff)
downloadsynapse-a696c48133d9f9a94f8b078aeacce0bef0d693b4.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions_eiah
Diffstat (limited to '.circleci')
0 files changed, 0 insertions, 0 deletions