SpiritCroc d4cb55eeaa Merge tag 'v1.5.20' into sc ... Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680 Conflicts: dependencies.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt vector/src/main/java/im/vector/app/core/resources/StringProvider.kt vector/src/main/res/xml/vector_settings_advanced_settings.xml		2023-01-13 14:50:46 +01:00
..
src/main	Merge tag 'v1.5.20' into sc	2023-01-13 14:50:46 +01:00
build.gradle	Bump gradle from 7.2.2 to 7.3.1 (#7364)	2022-10-17 09:14:28 +02:00