diff options
author | Erik Johnston <erik@matrix.org> | 2016-08-04 14:04:35 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-08-04 14:04:35 +0100 |
commit | b4e2290d8951822bb3309b99830a775d9e5826e2 (patch) | |
tree | 5333716daa806065b5a59c4815a022b855032e3e /tox.ini | |
parent | Tidy up get_events (diff) | |
parent | Merge pull request #982 from matrix-org/erikj/fix_port_script (diff) | |
download | synapse-b4e2290d8951822bb3309b99830a775d9e5826e2.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions