summary refs log tree commit diff
path: root/synapse/handlers/appservice.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-14 14:46:55 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-14 14:46:55 +0000
commit15e988519749c92a6ff56ad8174cf17b9585bc64 (patch)
tree8184ed7827e1724ba58528acab89c7f4b4f9687f /synapse/handlers/appservice.py
parentMerge pull request #439 from matrix-org/daniel/typo (diff)
parentMerge pull request #441 from matrix-org/markjh/fts_skip_invalid (diff)
downloadsynapse-15e988519749c92a6ff56ad8174cf17b9585bc64.tar.xz
Merge branch 'release-v0.12.0' into develop
Diffstat (limited to 'synapse/handlers/appservice.py')
0 files changed, 0 insertions, 0 deletions