diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-26 16:22:45 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-26 16:22:45 +0100 |
| commit | 03e634dad4cd1014f609ece9574df7a24f1ec254 (patch) | |
| tree | a9f4a53a03bb0205e616ce7cf741fdbd15d4fcf5 /docker | |
| parent | pep8 (diff) | |
| parent | Port register_new_matrix_user to Python 3 and add tests (#4085) (diff) | |
| download | synapse-03e634dad4cd1014f609ece9574df7a24f1ec254.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_state_groups
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/conf/homeserver.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml |