SpiritCroc 133579d066 Merge tag 'v1.2.1' into sc ... Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a Conflicts: build.gradle matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/core/di/VectorComponent.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/composer/VoiceMessageRecorderView.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/list/actions/RoomListQuickActionsEpoxyController.kt vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt		2021-09-09 10:51:12 +02:00
..
sampledata	textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body	2021-06-14 22:10:12 +02:00
signature
src	Merge tag 'v1.2.1' into sc	2021-09-09 10:51:12 +02:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge tag 'v1.2.1' into sc	2021-09-09 10:51:12 +02:00
lint.xml	Remove useless parent	2021-06-11 10:22:18 +02:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00