diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-06-03 14:51:33 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2016-06-03 14:51:33 +0100 |
commit | dd6f62ed99033d7c793685b6cce5dfba9d3aff89 (patch) | |
tree | 0044c60b4100253a0875be891bbb4ecfce80d47c /setup.py | |
parent | Send updates to the syncing users every ten seconds or immediately if they've... (diff) | |
parent | Merge pull request #833 from matrix-org/markjh/client_ips (diff) | |
download | synapse-dd6f62ed99033d7c793685b6cce5dfba9d3aff89.tar.xz |
Merge branch 'develop' into markjh/synchrotronII
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions