gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'develop' and 't3chguy/app_load4' of github.com:vector-im/riot-web into t3chguy/app_load4

This commit is contained in:
Michael Telatynski 2020-04-23 10:12:06 +01:00
parent 6584ff29af 6b1965388e
commit f0011a0183
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/config.md
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

3
docs/jitsi.md
View File

@ -40,7 +40,8 @@ should start a new conference on your Jitsi server.
domain will appear later in the URL as a configuration parameter. domain will appear later in the URL as a configuration parameter.
**Hint**: If you want everyone on your homeserver to use the same Jitsi server by **Hint**: If you want everyone on your homeserver to use the same Jitsi server by
default, set the following on your homeserver's `/.well-known/matrix/client` config: default, and you are using riot-web 1.6 or newer, set the following on your homeserver's
`/.well-known/matrix/client` config:
```json ```json
{ {
"im.vector.riot.jitsi": { "im.vector.riot.jitsi": {