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

This commit is contained in:
David Baker 2017-10-27 19:01:34 +01:00
commit b9e2b59504
12 changed files with 291 additions and 232 deletions

View file

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