diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-22 13:35:34 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-22 13:35:34 +0000 |
commit | 7f058c5ff743e2cf563b9aa5436ee9801a14e633 (patch) | |
tree | 8ef0270ede93c304b0859c4e8fba49b9581b2514 /tests/util/test_lrucache.py | |
parent | Add twisted Service interface (diff) | |
parent | Move experiments, graph and cmdclient into contrib (diff) | |
download | synapse-7f058c5ff743e2cf563b9aa5436ee9801a14e633.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
Conflicts: synapse/app/homeserver.py
Diffstat (limited to 'tests/util/test_lrucache.py')
0 files changed, 0 insertions, 0 deletions