SpiritCroc
4b63a9f939
Merge tag 'v1.3.9' into sc
Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861
Conflicts:
vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
vector/src/main/java/im/vector/app/VectorApplication.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/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/composer/VoiceMessageRecorderView.kt
vector/src/main/res/drawable/ic_shield_custom.xml
vector/src/main/res/drawable/ic_shield_trusted.xml
2021-12-05 13:46:55 +01:00
..
2021-10-12 13:47:32 +02:00
2021-10-01 13:31:15 +02:00
2021-12-05 13:46:55 +01:00
2021-10-01 13:31:15 +02:00
2020-10-08 15:04:55 +02:00
2021-10-27 16:42:35 +01:00