mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-08 17:27:44 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector/src
History
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
..
androidTest/java/im/vector/app Quick fix on this file 2021-11-15 21:37:51 +01:00
debug adding remaining activity missing hilt injection annotations 2021-10-26 17:56:22 +01:00
fdroid/java/im/vector/app Merge tag 'v1.3.7' into sc 2021-11-17 19:01:22 +01:00
gplay Merge tag 'v1.3.8' into HEAD 2021-11-17 20:17:45 +01:00
main Merge tag 'v1.3.8' into HEAD 2021-11-17 20:17:45 +01:00
release Move test style Activity and layout to the new ui-style module 2021-06-15 18:17:36 +02:00
sharedTest/java/im/vector/app/test/shared Rename package im.vector.riotx to im.vector.app (IDE) 2020-08-03 18:46:29 +02:00
test/java/im/vector/app Merge pull request #4430 from vector-im/feature/adm/feature-notification-images 2021-11-15 12:46:51 +01:00