summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-05-01 18:53:56 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-05-01 18:53:56 +0100
commit2414178ed60faecc67180b233f56055b7e2c5b99 (patch)
tree464aa4e585784c2bf5b74765813e4ba09193e7b2 /synapse/handlers/message.py
parentMerge branch 'release-v0.28.1' into develop (diff)
parentfix conflict in changelog from previous release (diff)
downloadsynapse-2414178ed60faecc67180b233f56055b7e2c5b99.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/handlers/message.py')
0 files changed, 0 insertions, 0 deletions