master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
9a381b557e
schildichat-android/vector-app/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/java/im/vector/app Organization renaming: replace all https://github.com/vector-im by https://github.com/element-hq 2023-12-13 11:01:40 +01:00
debug Merge tag 'v1.6.0' into sc 2023-05-22 14:19:46 +02:00
fdroid Merge tag 'v1.6.0' into sc 2023-05-22 14:19:46 +02:00
gplay Merge tag 'v1.6.10' into sc 2024-01-10 19:57:20 +01:00
main Merge tag 'v1.6.18' into sc 2024-06-29 10:28:16 +02:00
nightly/res remove app_name from resource 2023-03-15 09:20:03 +01:00
release remove app_name from resource 2023-03-15 09:20:03 +01:00