mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'master' of github.com:vector-im/riot-web into set_default_federate_by_settings

Browse source
This commit is contained in:
Michael Telatynski 2017-08-02 11:48:20 +01:00
commit 27a1038e8d
No known key found for this signature in database
GPG key ID: 0435A1D4BBD34D64
448 changed files with 9119 additions and 1588 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config.sample.json
View file

@ -4,12 +4,17 @@
"brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"bug_report_endpoint_url": "https://vector.im/bugs",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"enableLabs": true,
"default_federate": true,
"roomDirectory": {
"servers": [
"matrix.org"
]
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
"url": "https://piwik.riot.im/",
"siteId": 1
}
}