summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-14 14:42:03 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-14 14:42:03 +0000
commitb02465b9db25e13c25479787cb581ac3c83e20b3 (patch)
treed69714d864b5a87021f2fc0d2216321a8ec7f562 /synapse/server.py
parentMerge pull request #4450 from 14mRh4X0r/fix-dependency-message (diff)
parentMerge tag 'v0.99.1' (diff)
downloadsynapse-b02465b9db25e13c25479787cb581ac3c83e20b3.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions