NIkita Fedrunov 761b8031f6 Merge branch 'develop' into sync-analytics-plan ... # Conflicts: # vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt # vector/src/main/java/im/vector/app/features/analytics/plan/Composer.kt # vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt		2022-02-09 16:27:33 +01:00
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Merge branch 'develop' into sync-analytics-plan	2022-02-09 16:27:33 +01:00
.gitignore
build.gradle	Bump versions to 1.4.2	2022-02-09 12:55:33 +01:00
lint.xml	Revert "AGP 7.1.0"	2022-02-04 12:20:20 +02:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00