master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
sc
schildichat-android/matrix-sdk-android/src/main
History
SpiritCroc 79bc2b68c2 Merge tag 'v1.6.44' into sc 
Change-Id: I0ff9f86482ed8f6f43604592e37e507da7764495

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
	vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
	vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
2025-08-09 12:04:07 +02:00
..
assets
java Merge tag 'v1.6.44' into sc 2025-08-09 12:04:07 +02:00
res Sync SAS Strings 2023-12-11 00:03:20 +00:00
AndroidManifest.xml Upgrade a few dependencies and update the codebase 2024-07-15 18:12:20 +02:00