diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-05 17:27:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-09-05 17:27:46 +0100 |
| commit | 591d82f06b81738efe67c13cdeee0901c3b28946 (patch) | |
| tree | 018ec1d3caaa956d2173e9b11c74f78619aba0de /synapse/config/_base.py | |
| parent | Fix test (diff) | |
| parent | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... (diff) | |
| download | synapse-591d82f06b81738efe67c13cdeee0901c3b28946.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/censor_redactions
Diffstat (limited to 'synapse/config/_base.py')
0 files changed, 0 insertions, 0 deletions