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

2017-12-19 13:23:21 +00:00 · 2017-12-19 13:23:21 +00:00 · 7dd85533e8
parent 707cb47e10 af99ac3293
commit 7dd85533e8
1 changed files with 4 additions and 0 deletions
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@ -5,6 +5,10 @@
    "brand": "Riot",
    "integrations_ui_url": "https://scalar.vector.im/",
    "integrations_rest_url": "https://scalar.vector.im/api",
+    "integrations_widgets_urls": [
+        "https://scalar-staging.riot.im/scalar/api",
+        "https://scalar.vector.im/api"
+    ],
    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
    "welcomeUserId": "@riot-bot:matrix.org",
    "roomDirectory": {