nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into toml/keycloak_hints

Browse Source
This commit is contained in:
Tom
2020-10-15 11:54:08 +01:00
parent dbd3f17c21 d4d1b957af
commit be1e99b435
32 changed files with 1762 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config.sample.json
View File

@@ -36,7 +36,6 @@
"matrix.org"
]
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
"url": "https://piwik.riot.im/",
"whitelistedHSUrls": ["https://matrix.org"],