diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-15 16:27:08 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-15 16:27:08 +0100 |
commit | 86a00e05e1db0fd4fa7a0192520504c229b6f79c (patch) | |
tree | 17c0ac3804e223913549a50cfa6c5d5616824568 /synapse/federation/__init__.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by... (diff) | |
parent | Merge pull request #3653 from matrix-org/erikj/split_federation (diff) | |
download | synapse-86a00e05e1db0fd4fa7a0192520504c229b6f79c.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'synapse/federation/__init__.py')
0 files changed, 0 insertions, 0 deletions