SpiritCroc 49663a1154 Merge tag 'v1.4.18' into sc ... Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5 Conflicts: dependencies.gradle library/attachment-viewer/build.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt vector/src/main/java/im/vector/app/AppStateHandler.kt vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt vector/src/main/java/im/vector/app/core/utils/Emoji.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/res/xml/vector_settings_labs.xml		2022-06-01 13:54:34 +02:00
..
src/main	Merge tag 'v1.4.18' into sc	2022-06-01 13:54:34 +02:00
.gitignore	Add a module library/core-utils as a base module for all util tools	2022-01-13 20:28:50 +01:00
build.gradle	Merge remote-tracking branch 'origin/develop' into dependency-cleanup	2022-05-18 11:47:21 +02:00