Merge branch 'element-hq:develop' into yostyle/fix_crypto_migration

yostyle · web-flow · commit f3c653501192 · 2023-12-18T08:35:32.000Z
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -205,7 +205,7 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
                         setServerURL(it)
                     }
                 }
-                // https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/flags/constants.js
+                // https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/flags/constants.ts
                 .setFeatureFlag("chat.enabled", false)
                 .setFeatureFlag("invite.enabled", false)
                 .setFeatureFlag("add-people.enabled", false)

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee`
`205`	`205`	`setServerURL(it)`
`206`	`206`	`}`
`207`	`207`	`}`
`208`		`- // https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/flags/constants.js`
	`208`	`+ // https://github.com/jitsi/jitsi-meet/blob/master/react/features/base/flags/constants.ts`
`209`	`209`	`.setFeatureFlag("chat.enabled", false)`
`210`	`210`	`.setFeatureFlag("invite.enabled", false)`
`211`	`211`	`.setFeatureFlag("add-people.enabled", false)`