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
..
sampledata
signature
src	Merge remote-tracking branch 'origin/develop' into feature/eric/registration-feature-flag	2022-02-23 17:31:43 +01:00
.gitignore
build.gradle	Merge pull request #5309 from vector-im/feature/eric/modules-to-subfolder	2022-02-22 22:58:14 +01:00
lint.xml	Revert "AGP 7.1.0"	2022-02-04 12:20:20 +02:00
proguard-rules.pro