ariskotsomitopoulos cd95fc41e4 Merge branch 'develop' into feature/aris/threads ... # Conflicts: # library/ui-styles/src/main/res/values/dimens.xml # matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.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/database/model/EventEntity.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt # vector/src/main/java/im/vector/app/core/di/FragmentModule.kt # vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt # vector/src/main/java/im/vector/app/features/command/Command.kt # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt # vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt # vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt # vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.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/java/im/vector/app/features/notifications/NotificationUtils.kt # vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt # vector/src/main/res/layout/fragment_room_detail.xml		2021-12-14 20:18:54 +02:00
..
src/main	Merge branch 'develop' into feature/aris/threads	2021-12-14 20:18:54 +02:00
.gitignore	Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"	2021-10-07 11:11:44 +02:00
build.gradle	No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4	2021-10-19 19:06:27 +02:00
consumer-rules.pro	Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"	2021-10-07 11:11:44 +02:00
proguard-rules.pro	Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"	2021-10-07 11:11:44 +02:00