summary refs log tree commit diff
path: root/synapse/handlers/appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-07-24 17:22:23 +0100
committerErik Johnston <erik@matrix.org>2018-07-24 17:22:23 +0100
commitc9db8b0c32886b381e59293cf4157a86c53e6746 (patch)
tree6a247eceb8cbe8ee491d85420a09717180b635c5 /synapse/handlers/appservice.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3597 from matrix-org/erikj/did_forget (diff)
downloadsynapse-c9db8b0c32886b381e59293cf4157a86c53e6746.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/appservice.py')
0 files changed, 0 insertions, 0 deletions