ericdecanini 8647400dda Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt		2022-05-25 17:35:31 +02:00
..
sampledata
signature
src	Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis	2022-05-25 17:35:31 +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
proguard-rules.pro