ericdecanini 6df88fba59 Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.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/features/home/HomeActivity.kt # vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt # vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.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/style/TimelineMessageLayoutFactory.kt # vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt		2022-06-08 12:59:54 +02:00
..
java/org/matrix/android/sdk	Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment	2022-06-08 12:59:54 +02:00
AndroidManifest.xml	Handle change from WorkManager 2.6.0.	2021-09-30 12:06:57 +02:00