mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-06 22:46:16 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector/src/main
History
SpiritCroc 21eec091f8 Merge tag 'v1.6.18' into sc 
Change-Id: Ifc8466ddf92154fb9be05b372f234ffe26da47ba

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
2024-06-29 10:28:16 +02:00
..
assets Import ExpandableViewLayout from rview 2022-11-20 11:25:05 +01:00
java Merge tag 'v1.6.18' into sc 2024-06-29 10:28:16 +02:00
res Merge tag 'v1.6.16' into sc 2024-05-30 20:16:19 +02:00
AndroidManifest.xml Merge tag 'v1.6.18' into sc 2024-06-29 10:28:16 +02:00