summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-25 11:34:49 +0100
committerErik Johnston <erik@matrix.org>2019-10-25 11:34:49 +0100
commit64c2cfda8a0ad9bc2aade76b10ce96c419922e82 (patch)
tree078e62c3d4955507a62a835b12eadf25d1148f0b /synapse/events
parentMerge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop (diff)
parentMerge pull request #6255 from matrix-org/erikj/stats_config (diff)
downloadsynapse-64c2cfda8a0ad9bc2aade76b10ce96c419922e82.tar.xz
Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/events')
0 files changed, 0 insertions, 0 deletions