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
..
src/main	Use correct value, but I do not see any effect on emulator with API 12	2021-11-15 12:25:42 +01:00
.gitignore	Initial commit	2020-07-08 20:09:55 +02:00
build.gradle	Merge tag 'v1.3.4' into sc	2021-10-21 17:31:11 +02:00
consumer-rules.pro	Initial commit	2020-07-08 20:09:55 +02:00
proguard-rules.pro	Initial commit	2020-07-08 20:09:55 +02:00