diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:19:49 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:19:49 +0000 |
commit | c515d377973560a6e9d96fa5ee53e1de7dc67347 (patch) | |
tree | ec58161881f5d9180a41bb8610152cfe5ff0ddc5 /synapse/federation/transport/client.py | |
parent | Fix bug where we superfluously asked for current state. Change API of /query_... (diff) | |
parent | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into repli... (diff) | |
download | synapse-c515d377973560a6e9d96fa5ee53e1de7dc67347.tar.xz |
Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/schema/delta/v12.sql
Diffstat (limited to 'synapse/federation/transport/client.py')
0 files changed, 0 insertions, 0 deletions