summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-12-20 23:33:25 +0000
committerRichard van der Hoff <richard@matrix.org>2018-12-20 23:33:25 +0000
commitc8d32caba3032d482d4c16b13aa0cf17a2b03e95 (patch)
tree905e089618af782dac083f4327d925e63e3cab29 /synapse/app/homeserver.py
parentMerge branch 'master' into develop (diff)
parentMention updating extensions (diff)
downloadsynapse-c8d32caba3032d482d4c16b13aa0cf17a2b03e95.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/app/homeserver.py')
0 files changed, 0 insertions, 0 deletions