ericdecanini 5cc7deea4e Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt # vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt # vector/src/main/java/im/vector/app/core/utils/TextUtils.kt # vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt # vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.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/HomeDetailFragment.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/timeline/factory/LiveLocationShareMessageItemFactory.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt # vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt # vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt		2022-06-03 12:06:23 +02:00
..
docs	Package have been renamed, so also rename it here.	2022-05-20 21:14:42 +02:00
src	Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment	2022-06-03 12:06:23 +02:00
.gitignore
build.gradle	Version++	2022-05-31 17:58:09 +02:00
proguard-rules.pro