summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-30 14:41:31 +0100
committerErik Johnston <erik@matrix.org>2016-03-30 14:41:31 +0100
commitd24662b88a59c872db4b5d96d2c5bec3c80294ca (patch)
tree28ec78dfcf1c8fe27c86709b5afea83d38a31556 /synapse/handlers/room.py
parentMerge pull request #671 from nikriek/jwt-support (diff)
parentMerge branch 'release-v0.14.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-d24662b88a59c872db4b5d96d2c5bec3c80294ca.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/room.py')
0 files changed, 0 insertions, 0 deletions