mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-18 07:11:58 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector/src
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
..
androidTest Analyics: stop double reporting posthog utds 2024-04-04 13:09:10 +02:00
debug/res/drawable Merge tag 'v1.5.0' into merge-v1.5.0 2022-09-23 16:28:00 +02:00
main Merge tag 'v1.6.18' into sc 2024-06-29 10:28:16 +02:00
release/res/drawable Merge tag 'v1.5.0' into merge-v1.5.0 2022-09-23 16:28:00 +02:00
sharedTest/java/im/vector/app/test/shared
test Merge tag 'v1.6.18' into sc 2024-06-29 10:28:16 +02:00