Merge pull request #13312 from vector-im/travis/docs-settings-fix

Fix `default_federate` settting description
This commit is contained in:
Travis Ralston 2020-04-22 08:36:17 -06:00 committed by GitHub
commit 6b1965388e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -100,7 +100,7 @@ For a good example, see https://riot.im/develop/config.json.
1. `disable_3pid_login`: Disables 3rd party identity options on login and registration form 1. `disable_3pid_login`: Disables 3rd party identity options on login and registration form
Defaults to false (3rd party identity options are shown). Defaults to false (3rd party identity options are shown).
1. `default_federate`: Default option for room federation when creating a room 1. `default_federate`: Default option for room federation when creating a room
Defaults to false (room federation enabled). Defaults to true (room federation enabled).
Note that `index.html` also has an og:image meta tag that is set to an image Note that `index.html` also has an og:image meta tag that is set to an image
hosted on riot.im. This is the image used if links to your copy of Riot hosted on riot.im. This is the image used if links to your copy of Riot