summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/capabilities.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-03-28 18:32:13 +0000
committerGitHub <noreply@github.com>2019-03-28 18:32:13 +0000
commit902cdc63b6668bebbf66dc084de057386da59bd8 (patch)
tree408a8187c455a4cfc47e8b4fbf6e11aaf0c3c893 /synapse/rest/client/v2_alpha/capabilities.py
parentMerge pull request #4954 from matrix-org/rav/refactor_parse_row (diff)
parentchangelog (diff)
downloadsynapse-902cdc63b6668bebbf66dc084de057386da59bd8.tar.xz
Merge pull request #4955 from matrix-org/rav/merge_state_into_events
Combine the CurrentStateDeltaStream into the EventStream
Diffstat (limited to 'synapse/rest/client/v2_alpha/capabilities.py')
0 files changed, 0 insertions, 0 deletions