summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-01-27 15:58:27 +0000
committerDavid Baker <dave@matrix.org>2015-01-27 15:58:27 +0000
commit1d779691248be2fcdd43e97352d13c2cef239c10 (patch)
tree0b6b40aec503ca42f77b968c6d84b204edefeb48 /synapse/handlers/message.py
parentSupport membership events and more camelcase/underscores (diff)
downloadsynapse-1d779691248be2fcdd43e97352d13c2cef239c10.tar.xz
Unbreak bad presence merge - don't add these blocks together with an and: they're different things.
Diffstat (limited to 'synapse/handlers/message.py')
0 files changed, 0 insertions, 0 deletions