diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-11-02 10:57:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-11-02 10:57:00 +0000 |
| commit | 0e367563838de76972bac1fd7bc3ab3943b9a57e (patch) | |
| tree | f3de1ae204fa232033d8951c31a45a71a797d94c /tox.ini | |
| parent | Support clients supplying older tokens, fix short poll test (diff) | |
| parent | Merge pull request #337 from matrix-org/markjh/v2_sync_joining (diff) | |
| download | synapse-0e367563838de76972bac1fd7bc3ab3943b9a57e.tar.xz | |
Merge branch 'develop' into markjh/room_tags
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini |