summary refs log tree commit diff
path: root/synapse/appservice/api.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-10-15 10:43:54 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-10-15 10:43:54 -0400
commit74976a8e43b9ab1d06b3142a8197dfb1e3626c6d (patch)
tree36411bd6c8fd337b08a56d963e2ce9cfeb6b24a6 /synapse/appservice/api.py
parentMerge branch 'release-v1.21.2' into develop (diff)
parentAdditional tweaks. (diff)
downloadsynapse-74976a8e43b9ab1d06b3142a8197dfb1e3626c6d.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/appservice/api.py')
0 files changed, 0 insertions, 0 deletions