summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-10-21 16:47:19 +0100
committerMark Haines <mjark@negativecurvature.net>2015-10-21 16:47:19 +0100
commit13a6e9beafd61c2f01dea14d936b2e25dff6b4d4 (patch)
tree1a23e19f9be1c6139fbff4052b416261d6aadcd6 /demo
parentMerge pull request #316 from matrix-org/markjh/v2_sync_archived (diff)
parentMerge branch 'develop' into markjh/v2_sync_typing (diff)
downloadsynapse-13a6e9beafd61c2f01dea14d936b2e25dff6b4d4.tar.xz
Merge pull request #321 from matrix-org/markjh/v2_sync_typing
Include typing events in initial v2 sync
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions