ariskotsomitopoulos e323caa233 Merge branch 'develop' into feature/aris/crypto_replay_attack ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt		2022-05-20 15:46:15 +03: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 branch 'develop' into feature/aris/crypto_replay_attack	2022-05-20 15:46:15 +03:00
.gitignore
build.gradle	Version++	2022-05-17 21:28:11 +02:00
proguard-rules.pro