summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-07 19:21:00 +0100
committerErik Johnston <erik@matrix.org>2015-05-07 19:21:00 +0100
commitdb0dca2f6f794e6f20718e935de0addd38fb008d (patch)
tree909927195735705e300b6e049f21cbebe67847e1 /synapse/server.py
parentrevert accidental bcrypt gensalt round reduction from loadtesting (diff)
parentMerge branch 'release-v0.9.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-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