summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-10-29 14:40:57 +0000
committerRichard van der Hoff <richard@matrix.org>2019-10-29 14:40:57 +0000
commit65cb307e19d9307e79625a15a087acde265988a7 (patch)
tree4a75598fa14548d3fbb8cca6e152ea4853af07b5 /synapse/appservice
parentMerge branch 'babolivier/changelog-name' into develop (diff)
parent1.5.0 (diff)
downloadsynapse-65cb307e19d9307e79625a15a087acde265988a7.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions