diff options
author | Erik Johnston <erik@matrix.org> | 2015-08-20 16:10:14 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-08-20 16:10:14 +0100 |
commit | b578c822e3f382d6321c76ded3f9bd57c371ab86 (patch) | |
tree | 1949a627914b7f22f4450fc76d133db49e278b3b /synapse/handlers/federation.py | |
parent | Merge pull request #237 from matrix-org/markjh/readme-rst-formatting (diff) | |
parent | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-b578c822e3f382d6321c76ded3f9bd57c371ab86.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0
Diffstat (limited to 'synapse/handlers/federation.py')
0 files changed, 0 insertions, 0 deletions