diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-07 19:21:00 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-07 19:21:00 +0100 |
commit | db0dca2f6f794e6f20718e935de0addd38fb008d (patch) | |
tree | 909927195735705e300b6e049f21cbebe67847e1 /synapse/server.py | |
parent | revert accidental bcrypt gensalt round reduction from loadtesting (diff) | |
parent | Merge branch 'release-v0.9.0' of github.com:matrix-org/synapse (diff) | |
download | synapse-db0dca2f6f794e6f20718e935de0addd38fb008d.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions