summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-01-30 17:02:32 +0000
committerRichard van der Hoff <richard@matrix.org>2019-01-30 17:02:32 +0000
commit6fba9fd20c8f29f6034236f653893a3bda165be2 (patch)
tree1ce9b816637de72b36c8acfe03ac791d842b0905 /synapse/federation/federation_server.py
parentby default include m.room.encryption on invites (#3902) (diff)
parentv0.99.0rc2 (diff)
downloadsynapse-6fba9fd20c8f29f6034236f653893a3bda165be2.tar.xz
Merge remote-tracking branch 'origin/release-v0.99.0' into develop
Diffstat (limited to 'synapse/federation/federation_server.py')
0 files changed, 0 insertions, 0 deletions