master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
cd5f1d32a4
schildichat-android/matrix-sdk-android
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
..
docs Package have been renamed, so also rename it here. 2022-05-20 21:14:42 +02:00
src Merge tag 'v1.5.24' into sc 2023-02-08 13:08:42 +01:00
.gitignore
build.gradle version++ 2023-01-25 14:06:48 +01:00
proguard-rules.pro