summary refs log tree commit diff
path: root/synapse/state
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-23 20:13:07 +0000
committerErik Johnston <erik@matrix.org>2019-01-23 20:13:07 +0000
commit17898a5ba66c7bc15b105e13c735478d03c4a3a4 (patch)
tree8b53d79e3f0bc652a209f92763223d1a602b2db6 /synapse/state
parentMerge branch 'erikj/get_pdu_versions' into erikj/require_format_version (diff)
parentClarify the invite flows (diff)
downloadsynapse-17898a5ba66c7bc15b105e13c735478d03c4a3a4.tar.xz
Merge branch 'erikj/fixup_rejecting_invites' of github.com:matrix-org/synapse into erikj/require_format_version
Diffstat (limited to 'synapse/state')
0 files changed, 0 insertions, 0 deletions