SpiritCroc 2f5df9133f Merge tag 'v1.4.2' into sc ... Change-Id: I8a96211645ff31284897d818ce93c7b5571fbd0f Conflicts: library/ui-styles/src/main/res/values/styles_timeline.xml library/ui-styles/src/main/res/values/theme_black.xml library/ui-styles/src/main/res/values/theme_dark.xml library/ui-styles/src/main/res/values/theme_light.xml matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt vector/src/main/java/im/vector/app/features/navigation/Navigator.kt vector/src/main/res/layout/item_room.xml vector/src/main/res/values/config.xml		2022-03-04 11:42:30 +01:00
..
core-utils	[merge] Further merge fixups	2022-01-29 15:56:13 +01:00
jsonviewer	Bump json from 20190722 to 20211205	2022-01-18 23:08:02 +00:00
ui-styles	Merge tag 'v1.4.2' into sc	2022-03-04 11:42:30 +01:00