summary refs log tree commit diff
path: root/tests/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-07-07 18:26:28 +0100
committerErik Johnston <erik@matrix.org>2017-07-07 18:26:28 +0100
commitf467a8f66dac153428efa8c2b6296b84674a91ea (patch)
tree100f3072b9a29af48f7ff55bea04f548702e1c9a /tests/events
parentMerge pull request #2344 from matrix-org/erikj/frontend_proxy (diff)
parentMerge branch 'hotfixes-v0.22.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-f467a8f66dac153428efa8c2b6296b84674a91ea.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tests/events')
0 files changed, 0 insertions, 0 deletions