summary refs log tree commit diff
path: root/synapse/federation/federation_client.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-05-01 18:52:44 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-05-01 18:52:44 +0100
commit40d1bbd257567740b9b8d08caeed4d3dae2a6aa4 (patch)
treed42e105d71b2173ee58d85e43ca4d83431188adc /synapse/federation/federation_client.py
parentUpdate CHANGES.rst (diff)
parentchangelog for 0.28.1 (diff)
downloadsynapse-40d1bbd257567740b9b8d08caeed4d3dae2a6aa4.tar.xz
fix conflict in changelog from previous release
Diffstat (limited to 'synapse/federation/federation_client.py')
0 files changed, 0 insertions, 0 deletions