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
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
..
androidTest misc : code clean up 2025-07-30 15:03:04 +02:00
debug/java/org/matrix/android/sdk/internal/network/interceptors Only one FormatterJsonHttpLogger implementation is required. 2022-08-24 10:11:24 +02:00
main Merge tag 'v1.6.44' into sc 2025-08-09 12:04:07 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors Only one FormatterJsonHttpLogger implementation is required. 2022-08-24 10:11:24 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared
test/java/org/matrix/android/sdk misc : code clean up 2025-07-30 15:03:04 +02:00