diff options
author | Neil Johnson <neil@fragile.org.uk> | 2018-05-01 18:52:44 +0100 |
---|---|---|
committer | Neil Johnson <neil@fragile.org.uk> | 2018-05-01 18:52:44 +0100 |
commit | 40d1bbd257567740b9b8d08caeed4d3dae2a6aa4 (patch) | |
tree | d42e105d71b2173ee58d85e43ca4d83431188adc /synapse/handlers/federation.py | |
parent | Update CHANGES.rst (diff) | |
parent | changelog for 0.28.1 (diff) | |
download | synapse-40d1bbd257567740b9b8d08caeed4d3dae2a6aa4.tar.xz |
fix conflict in changelog from previous release
Diffstat (limited to 'synapse/handlers/federation.py')
0 files changed, 0 insertions, 0 deletions