ericdecanini d5432cd0e7 Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis ... # Conflicts: # vector/src/main/java/im/vector/app/features/onboarding/DirectLoginUseCase.kt		2022-05-26 10:37:19 +02:00
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis	2022-05-26 10:37:19 +02:00
.gitignore
build.gradle	excluding the gms play-service-location optional transistive dependency for the fdroid variant	2022-05-24 10:10:03 +01:00
lint.xml	Small improvement on lint.xml file	2022-05-16 12:23:10 +02:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00