summary refs log tree commit diff
path: root/AUTHORS.rst
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-18 15:07:03 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-18 15:07:03 +0100
commitc632bc865448b40d246878e2d6c9287621b4ba0e (patch)
treed126c9cba47f70f40cee6acebac8f1cf93599e66 /AUTHORS.rst
parentMerge pull request #4049 from matrix-org/erikj/synctl_colour (diff)
parent0.33.7 (diff)
downloadsynapse-c632bc865448b40d246878e2d6c9287621b4ba0e.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'AUTHORS.rst')
0 files changed, 0 insertions, 0 deletions