diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-13 10:01:22 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-13 10:01:22 +0000 |
commit | 38e3241eb78d365e8264120574bc5970cfd5a326 (patch) | |
tree | f28cd87265be9df0d7bdc0b16b2645b8f9cd5657 /synapse/python_dependencies.py | |
parent | Use float rather than integer divisions to turn msec into sec - so timeouts u... (diff) | |
parent | Bump version (diff) | |
download | synapse-38e3241eb78d365e8264120574bc5970cfd5a326.tar.xz |
Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/python_dependencies.py')
0 files changed, 0 insertions, 0 deletions