Merge branch 'develop' of git+ssh://github.com/vector-im/riot-web into develop

ara4n · ara4n · commit c3e6a3078958 · 2020-01-31T15:22:44.000Z
diff --git a/docs/labs.md b/docs/labs.md
@@ -93,3 +93,8 @@ tab as the single source of truth just yet.
 
 This adds a presence indicator in the room list next to DM rooms where the other
 person is online.
+
+## Show padlocks on invite only rooms (`feature_invite_only_padlocks`)
+
+This adds padlocks to room list tiles and room header for invite only rooms.
+This feature flag (unlike most) is enabled by default.
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
@@ -21,6 +21,7 @@
         "feature_mjolnir": "labs",
         "feature_dm_verification": "labs",
         "feature_cross_signing": "enable",
+        "feature_invite_only_padlocks": "enable",
         "feature_event_indexing": "disable",
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs"
