diff options
author | Erik Johnston <erik@matrix.org> | 2015-06-15 14:16:12 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-06-15 14:16:12 +0100 |
commit | cebde85b94692cfe062d74bb2c884dd097dc8bb4 (patch) | |
tree | 97599d7f663d6a727c470f240f2971ac9a9e42c9 /synapse/federation/federation_client.py | |
parent | Merge pull request #183 from intelfx/install-python-schema-deltas (diff) | |
parent | Merge pull request #184 from matrix-org/hotfixes-v0.9.2-r1 (diff) | |
download | synapse-cebde85b94692cfe062d74bb2c884dd097dc8bb4.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into hotfixes-v0.9.2-r2
Diffstat (limited to 'synapse/federation/federation_client.py')
0 files changed, 0 insertions, 0 deletions