diff options
author | Erik Johnston <erik@matrix.org> | 2016-09-02 11:04:48 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-09-02 11:04:48 +0100 |
commit | 657847e4c6b955911768e7d3025ac1b245208882 (patch) | |
tree | a826411c63b4691a7356ce2740e7b4438b8ead78 /synapse/config/cas.py | |
parent | Limit the length of state chains (diff) | |
parent | Merge pull request #1061 from matrix-org/erikj/linearize_resolution (diff) | |
download | synapse-657847e4c6b955911768e7d3025ac1b245208882.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'synapse/config/cas.py')
0 files changed, 0 insertions, 0 deletions