SpiritCroc b2c8548e29 Merge tag 'v1.6.8' into sc ... tag Change-Id: I0a2384fc2e4eda861a191b0b8c85641916854ac8 Conflicts: dependencies.gradle matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt matrix-sdk-android/src/kotlinCrypto/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector-app/build.gradle vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt		2023-11-28 20:04:00 +01:00
..
docs
src	Merge tag 'v1.6.8' into sc	2023-11-28 20:04:00 +01:00
.gitignore
build.gradle	bump crypto sdk to 0.3.16	2023-11-13 22:23:11 +01:00
proguard-rules.pro