ericdecanini 64e074840b Merge remote-tracking branch 'origin/develop' into feature/eric/registration-feature-flag ... # Conflicts: # vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt # vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt # vector/src/main/java/im/vector/app/features/VectorFeatures.kt		2022-02-23 17:31:43 +01:00
..
java/im/vector/app	Merge remote-tracking branch 'origin/develop' into feature/eric/registration-feature-flag	2022-02-23 17:31:43 +01:00
res	Merge branch 'develop' into feature/bma/posthog	2021-12-13 23:18:14 +01:00
AndroidManifest.xml	Merge branch 'develop' into feature/bma/posthog	2021-12-13 23:18:14 +01:00