SchildiChat-android/vector
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
..
sampledata
signature
src Merge tag 'v1.3.8' into HEAD 2021-11-17 20:17:45 +01:00
.gitignore
build.gradle Merge tag 'v1.3.8' into HEAD 2021-11-17 20:17:45 +01:00
lint.xml Fix lint issue 2021-11-17 14:18:12 +01:00
proguard-rules.pro Fix Authenticated Jitsi not working in release #3841 2021-08-16 15:43:35 +02:00