diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-01 21:32:12 +1100 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-01 21:32:12 +1100 |
commit | 073d400b84f1f519b2295f7613bed4c39bbc7a21 (patch) | |
tree | 22cf9bbdb49ff952a8cb53367de5c512ecffa0b5 /tests/test_federation.py | |
parent | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff) | |
parent | Merge branch 'release-v0.33.8' (diff) | |
download | synapse-073d400b84f1f519b2295f7613bed4c39bbc7a21.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'tests/test_federation.py')
0 files changed, 0 insertions, 0 deletions