diff options
author | Erik Johnston <erik@matrix.org> | 2016-01-05 10:25:13 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-01-05 10:25:13 +0000 |
commit | 07c33eff43f4c7095c3884c50649e4b498bde038 (patch) | |
tree | 6d074d4f84a75f226a542a8e18fb3742855a535d /synapse/handlers/room.py | |
parent | Merge remote-tracking branch 'origin/release-v0.12.0' (diff) | |
parent | typoe (diff) | |
download | synapse-07c33eff43f4c7095c3884c50649e4b498bde038.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