diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-05-02 11:22:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 11:22:40 +0100 |
| commit | c193b39134e0afb5a185b535bf79027d1fa699d0 (patch) | |
| tree | aa3674c9fe285f74e6ba3ff67e50ce851cfb74c7 /docs | |
| parent | Factor out an "assert_requester_is_admin" function (#5120) (diff) | |
| parent | Add some limitations to alias creation (diff) | |
| download | synapse-c193b39134e0afb5a185b535bf79027d1fa699d0.tar.xz | |
Merge pull request #5124 from matrix-org/babolivier/aliases
Add some limitations to alias creation
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 61be7502bc..fa2bccd5ef 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -239,6 +239,11 @@ listeners: # Used by phonehome stats to group together related servers. #server_context: context +# Whether to require a user to be in the room to add an alias to it. +# Defaults to 'true'. +# +#require_membership_for_aliases: false + ## TLS ## |