diff options
author | Matthew Hodgson <matthew@matrix.org> | 2017-01-07 04:00:42 +0000 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2017-01-07 04:00:42 +0000 |
commit | 2f4b2f4783c608e27dba91e528d2c5a9032b0051 (patch) | |
tree | ead50f761654ce02404fed1f1c33afaebd6772f0 /synapse/handlers | |
parent | Merge branch 'release-v0.18.7' into develop (diff) | |
download | synapse-2f4b2f4783c608e27dba91e528d2c5a9032b0051.tar.xz |
gah, fix mangled merge of 0.18.7 into develop
Diffstat (limited to 'synapse/handlers')
0 files changed, 0 insertions, 0 deletions