filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
SchildiChat-android/vector-app/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/java/im/vector/app Fix import 2023-02-01 23:26:49 +01:00
debug Merge tag 'v1.5.24' into sc 2023-02-08 13:08:42 +01:00
fdroid Merge tag 'v1.5.24' into sc 2023-02-08 13:08:42 +01:00
gplay Move clock to core-utils module 2023-01-31 16:45:48 +01:00
main Merge tag 'v1.5.24' into sc 2023-02-08 13:08:42 +01:00
nightly/res/xml lifting nightly to the application module 2022-09-15 14:50:08 +01:00
release Merge tag 'v1.5.0' into merge-v1.5.0 2022-09-23 16:28:00 +02:00