summary refs log tree commit diff
path: root/docs/sphinx/conf.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-01-08 13:27:17 +0000
committerRichard van der Hoff <richard@matrix.org>2020-01-08 13:27:17 +0000
commitb064a41291f2aaa4c99fc22ee3d81385a4137e9a (patch)
tree7af39994034ae1914cb8adffb27fa6a8a392e809 /docs/sphinx/conf.py
parentMerge pull request #6624 from matrix-org/babolivier/retention_doc (diff)
parentFix GET request on /_synapse/admin/v2/users endpoint (#6563) (diff)
downloadsynapse-b064a41291f2aaa4c99fc22ee3d81385a4137e9a.tar.xz
Merge remote-tracking branch 'origin/release-v1.8.0' into develop
Diffstat (limited to 'docs/sphinx/conf.py')
0 files changed, 0 insertions, 0 deletions