summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-31 10:01:56 +0100
committerErik Johnston <erik@matrix.org>2019-07-31 10:01:56 +0100
commitc1ee2999a06b5ed5e455d239a3d0f31ab87c72f4 (patch)
treeaa9457fdb9ae55a37509031396a3511494e013de /synapse/handlers/message.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #5793 from matrix-org/erikj/fix_bg_update (diff)
downloadsynapse-c1ee2999a06b5ed5e455d239a3d0f31ab87c72f4.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/message.py')
0 files changed, 0 insertions, 0 deletions