summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-19 12:44:04 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-19 12:44:04 +0100
commit11d592290cbb3735a9bf2ef0c9776c559d231229 (patch)
tree52efacbb18512c734a2ce2fd797d95b9d12b6f96 /synapse/server.py
parentMerge branch 'master' into develop (diff)
parentUpdate r0.33.0 release notes (diff)
downloadsynapse-11d592290cbb3735a9bf2ef0c9776c559d231229.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions