From 81f8a8110545c1d75f281a31e7eeed6b480720f5 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jul 2020 13:58:10 -0600
Subject: [PATCH 1/2] Remove labs flag from config

---
 riot.im/develop/config.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index 908a12c8..ae1f42df 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -25,7 +25,6 @@
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs",
         "feature_custom_themes": "labs",
-        "feature_new_room_list": "labs",
         "feature_irc_ui": "labs"
     },
     "piwik": {

From 28b5b0b552d234110c09922aa99476f365471a40 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 7 Jul 2020 14:00:52 -0600
Subject: [PATCH 2/2] Update labs.md for new room list

---
 docs/labs.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/labs.md b/docs/labs.md
index 09a8e0c9..a5fab866 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -100,10 +100,21 @@ 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.
 
 ## IRC message layout (`feature_irc_ui`)