master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
0cb9fdd3a2
schildichat-android/matrix-sdk-android/src
History
SpiritCroc 9269a4442c Merge remote-tracking branch 'sc2/merge-v1.5.4-1' into sc 
Change-Id: Idc08fd88297d8e1f5211908217e32b93fb6df693

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
2022-10-28 18:16:15 +02:00
..
androidTest Merge pull request #7290 from vector-im/feature/bca/hinder_verification 2022-10-05 14:34:34 +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 remote-tracking branch 'sc2/merge-v1.5.4-1' into sc 2022-10-28 18:16:15 +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 Merge pull request #7293 from vector-im/feature/bma/android13 2022-10-13 13:52:52 +02:00