mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-21 08:55:42 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector
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
..
sampledata Add required resources. 2022-05-27 15:25:59 +03:00
src Merge tag 'v1.6.18' into sc 2024-06-29 10:28:16 +02:00
.gitignore
build.gradle Merge tag 'v1.6.18' into sc 2024-06-29 10:28:16 +02:00