summary refs log tree commit diff
path: root/tests/handlers/test_typing.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-21 14:10:31 +0000
committerErik Johnston <erik@matrix.org>2019-03-21 14:10:31 +0000
commitb0bf1ea7bda4894bae92a895c957a1a2ce431f4e (patch)
treec1ab07c55925e9c50aa0b7b55b4984bb9fc464e0 /tests/handlers/test_typing.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms (diff)
downloadsynapse-b0bf1ea7bda4894bae92a895c957a1a2ce431f4e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/handlers/test_typing.py')
0 files changed, 0 insertions, 0 deletions