summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-09-08 16:04:22 +0100
committerGitHub <noreply@github.com>2016-09-08 16:04:22 +0100
commit257025ac89f1a71173d6262248e7344b7aba9984 (patch)
tree033ae6c9b7f837a383c575bb8cd7f89d5f71df17 /tox.ini
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentUse parse_string (diff)
downloadsynapse-257025ac89f1a71173d6262248e7344b7aba9984.tar.xz
Merge pull request #1082 from matrix-org/erikj/remote_public_rooms
Add server param to /publicRooms
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions