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

jryans · jryans · commit fff29d566387 · 2020-07-13T18:48:34.000+01:00
diff --git a/docs/labs.md b/docs/labs.md
@@ -100,8 +100,19 @@ theme definition.
 
 For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes).
 
-## New room list (`feature_new_room_list`)
+## New room list
 
 A complete rewrite of the room list is underway to increase performance, stability,
-and general usability. This is still rapidly changing, but feel free to give it a test.
+and general usability.
+
+In the event the new room list needs to be disabled, add this to your config.json:
+```json
+{
+    "settingDefaults": {
+        "feature_new_room_list": false
+    }
+}
+```
+
+**Note**: In a future release the new room list will not be optional.
 
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
@@ -24,8 +24,7 @@
         "feature_dm_verification": "labs",
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs",
-        "feature_custom_themes": "labs",
-        "feature_new_room_list": "labs"
+        "feature_custom_themes": "labs"
     },
     "piwik": {
         "url": "https://piwik.riot.im/",
