summary refs log tree commit diff
path: root/AUTHORS.rst
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-06 09:50:54 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-06 09:50:54 +0000
commit7fe407a87a4e6fa0825487b03afe65173e2a66ad (patch)
tree9fcabd09ab1c15d70a7631b2df51ef2d8e97d8f1 /AUTHORS.rst
parentMerge branch 'master' into develop (diff)
parentFix docker upload job to push -py2 images (#4576) (diff)
downloadsynapse-7fe407a87a4e6fa0825487b03afe65173e2a66ad.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'AUTHORS.rst')
0 files changed, 0 insertions, 0 deletions