summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-11 13:16:11 +0100
committerErik Johnston <erik@matrix.org>2015-05-11 13:16:11 +0100
commite89ca34e0e23c46c8d72a0b03cf3f899f8d0fbb2 (patch)
treebe2ca2869db1599cee8aa43d6aa692c3fa9d5115 /synapse/handlers/room.py
parentMerge pull request #145 from matrix-org/hotfixes-v0.9.0-r3 (diff)
parentMerge pull request #146 from matrix-org/erikj/push_rules_fixes (diff)
downloadsynapse-e89ca34e0e23c46c8d72a0b03cf3f899f8d0fbb2.tar.xz
Merge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse v0.9.0-r4
Diffstat (limited to 'synapse/handlers/room.py')
0 files changed, 0 insertions, 0 deletions