mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 01:15:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/matrix-sdk-android/src
History
SpiritCroc 51274af2fe Merge tag 'v1.5.24' into sc 
Change-Id: I3eda119f38061c31595d9087f6067b269b87d8d1

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
2023-02-08 13:08:42 +01:00
..
androidTest Remove package declaration from AndroidManifest.xml 2023-01-11 11:38:23 +01: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.5.24' into sc 2023-02-08 13:08:42 +01: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 remote-tracking branch 'origin/develop' into fix-at-room 2023-02-06 09:36:00 +01:00