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/library
History
SpiritCroc d4cb55eeaa Merge tag 'v1.5.20' into sc 
Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
 		2023-01-13 14:50:46 +01:00
..
attachment-viewer Merge tag 'v1.5.8' into sc 2022-11-18 16:11:16 +01:00
core-utils Merge tag 'v1.5.8' into sc 2022-11-18 16:11:16 +01:00
external Bump gradle from 7.2.2 to 7.3.1 (#7364) 2022-10-17 09:14:28 +02:00
multipicker Merge tag 'v1.5.4' into merge-v1.5.4 2022-10-28 18:02:53 +02:00
ui-strings Merge tag 'v1.5.20' into sc 2023-01-13 14:50:46 +01:00
ui-styles Give replied-to text preview more height 2022-12-08 10:56:47 +01:00