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
..
signature	Remove usage of Buildkite.	2022-11-24 14:49:55 +01:00
src	Merge tag 'v1.5.16' into sc	2022-12-30 17:58:06 +01:00
build.gradle	Merge tag 'v1.5.20' into sc	2023-01-13 14:50:46 +01:00
proguard-rules.pro	Apply design changes to WYSIWYG editor (#7354)	2022-10-14 09:59:43 +02:00