Merge branch 'develop' into matthew/status

This commit is contained in:
Matthew Hodgson 2017-10-26 01:46:06 +01:00
commit 225c7ee621
37 changed files with 9612 additions and 131 deletions

View file

@ -5,7 +5,10 @@
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"enableLabs": true,
"features": {
"feature_groups": "labs"
"feature_pinning": "labs",
},
"default_federate": true,
"welcomePageUrl": "home.html",
"default_theme": "light",