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
..
docs	Add links to the doc (I've finally found a way to do it)	2022-05-16 12:23:10 +02:00
src	Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis	2022-05-25 17:35:31 +02:00
.gitignore
build.gradle	Version++	2022-05-17 21:28:11 +02:00
proguard-rules.pro