Merge branch 'develop' into string-pl

2021-06-28 22:13:51 -05:00 · 2021-06-28 22:13:51 -05:00 · 434b313850
commit 434b313850
parent 7b7ad76fe4 86228e08d8
59 changed files with 1196 additions and 866 deletions
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@ -33,6 +33,9 @@ export enum JoinRule {
    Public = "public",
    Knock = "knock",
    Invite = "invite",
+    /**
+     * @deprecated Reserved. Should not be used.
+     */
    Private = "private",
 }