diff options
author | Erik Johnston <erik@matrix.org> | 2019-01-21 14:04:19 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-01-21 14:04:19 +0000 |
commit | 35e1d67b4e9c2c8b0abf35d41c2d9c56d486f6e3 (patch) | |
tree | 2c844b79665fc32b0bfc49285586394edf367131 /docker/conf/homeserver.yaml | |
parent | Newsfile (diff) | |
parent | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis (diff) | |
download | synapse-35e1d67b4e9c2c8b0abf35d41c2d9c56d486f6e3.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_invite_server
Diffstat (limited to 'docker/conf/homeserver.yaml')
0 files changed, 0 insertions, 0 deletions