Merge branch 'develop' into andybalaam/stas-demydiuk-membership-type3

2024-03-20 17:25:23 +00:00
parent 5cd7743fcb 2cbf92860b
commit d7bdbee8d2
124 changed files with 2399 additions and 1052 deletions
--- a/src/components/structures/TimelinePanel.tsx
+++ b/src/components/structures/TimelinePanel.tsx
@@ -1046,7 +1046,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
        }

        if (
-            !(await client.doesServerSupportUnstableFeature("org.matrix.msc2285.stable")) ||
+            !(await client.doesServerSupportUnstableFeature("org.matrix.msc2285.stable")) &&
            !(await client.isVersionSupported("v1.4"))
        ) {
            logger.warn(