diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-29 09:57:43 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-29 09:57:43 +0100 |
commit | 06c4124f8ecbc70cbf21a351b4af32b87cc516f2 (patch) | |
tree | 0a6a78f5e32d54012545f3745525c5be29589182 /synapse/app/homeserver.py | |
parent | Use pyinstrument (diff) | |
parent | SYN-395: Fix CAPTCHA, don't double decode json (diff) | |
download | synapse-06c4124f8ecbc70cbf21a351b4af32b87cc516f2.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/profile_rununtilconcurrent
Diffstat (limited to 'synapse/app/homeserver.py')
0 files changed, 0 insertions, 0 deletions