summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-11-02 10:57:00 +0000
committerMark Haines <mark.haines@matrix.org>2015-11-02 10:57:00 +0000
commit0e367563838de76972bac1fd7bc3ab3943b9a57e (patch)
treef3de1ae204fa232033d8951c31a45a71a797d94c /scripts-dev
parentSupport clients supplying older tokens, fix short poll test (diff)
parentMerge pull request #337 from matrix-org/markjh/v2_sync_joining (diff)
downloadsynapse-0e367563838de76972bac1fd7bc3ab3943b9a57e.tar.xz
Merge branch 'develop' into markjh/room_tags
Diffstat (limited to 'scripts-dev')
0 files changed, 0 insertions, 0 deletions