gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-10-25 15:54:00 +00:00
parent 3fc0c455fa bc3df74c2f
commit 007177b7ba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.sample.json
View File

@ -6,8 +6,8 @@
"integrations_rest_url": "https://scalar.vector.im/api", "integrations_rest_url": "https://scalar.vector.im/api",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit", "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": { "features": {
"feature_groups": "labs" "feature_groups": "labs",
"feature_pinning": "labs", "feature_pinning": "labs"
}, },
"default_federate": true, "default_federate": true,
"roomDirectory": { "roomDirectory": {