SpiritCroc
d9a5991559
Merge tag 'v1.3.8' into HEAD
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309
Conflicts:
dependencies.gradle
vector/src/fdroid/AndroidManifest.xml
vector/src/gplay/AndroidManifest.xml
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/ComposerEditText.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-11-17 20:17:45 +01:00
..
2021-11-17 20:17:45 +01:00
2020-03-20 12:12:59 +03:00
2021-10-19 19:06:27 +02:00
2020-03-20 12:12:59 +03:00
2020-03-20 12:12:59 +03:00