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

2017-10-25 15:54:00 +00:00 · 2017-10-25 15:54:00 +00:00 · 007177b7ba
parent 3fc0c455fa bc3df74c2f
commit 007177b7ba
1 changed files with 2 additions and 2 deletions
--- a/config.sample.json
+++ b/config.sample.json
@ -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,
    "roomDirectory": {