SpiritCroc 51274af2fe Merge tag 'v1.5.24' into sc ... Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/res/layout/item_timeline_event_text_message_stub.xml		2023-02-08 13:08:42 +01:00
..
.gitignore	Rename towncrier folder from newsfragment to changelog.d	2021-06-18 21:33:50 +02:00
4612.misc	Changelog	2022-01-11 17:22:06 +01:00
4669.bugfix	Towncrier	2022-01-25 21:42:37 +01:00