diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-09 19:23:47 +1000 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-09 19:23:47 +1000 |
commit | 984376745b655d7b755e267a89a5b57ddfd3cf8b (patch) | |
tree | ea59b71d17d43f3ca7cac94c071cbd162c3550fe /synapse/config/server.py | |
parent | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet (diff) | |
parent | 0.33.2 changelog (diff) | |
download | synapse-984376745b655d7b755e267a89a5b57ddfd3cf8b.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config/server.py')
0 files changed, 0 insertions, 0 deletions