Merge branch 'develop' into travis/room-list/enable

2020-07-10 21:34:42 -06:00
parent 28b5b0b552 dbd62fb213
commit e6706b0e7b
4 changed files with 20 additions and 19 deletions
--- 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_irc_ui": "labs"
+        "feature_custom_themes": "labs"
    },
    "piwik": {
        "url": "https://piwik.riot.im/",