diff options
author | Erik Johnston <erik@matrix.org> | 2018-08-09 10:16:16 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-08-09 10:16:16 +0100 |
commit | 5785b93711da5e61cb6d446d090bb7daac5d61c8 (patch) | |
tree | e7dc98431b7f52526f85439e785f58a51df89553 /synapse/secrets.py | |
parent | Pull in necessary stores in federation_reader (diff) | |
parent | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet (diff) | |
download | synapse-5785b93711da5e61cb6d446d090bb7daac5d61c8.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_federation
Diffstat (limited to 'synapse/secrets.py')
0 files changed, 0 insertions, 0 deletions