diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-12-02 10:57:51 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-12-02 10:57:51 +0000 |
commit | dede14f689b1e9e297a337b8676a72930c96c5b4 (patch) | |
tree | 8cdd1b6604404627c51877d26fa83d9af6b6b00f /synapse/federation/transport/client.py | |
parent | Add comments (diff) | |
parent | Fix typo in collect_presencelike_data (diff) | |
download | synapse-dede14f689b1e9e297a337b8676a72930c96c5b4.tar.xz |
Merge branch 'develop' into markjh/edu_frequency
Diffstat (limited to 'synapse/federation/transport/client.py')
0 files changed, 0 insertions, 0 deletions