mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-24 06:49:00 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector/src
History
SpiritCroc 47fb27c822 Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: Iee76c18089fd7467256ca175390c713e01f92393

Conflicts:
	vector/src/main/res/values-cs/strings_sc.xml
	vector/src/main/res/values-de/strings_sc.xml
	vector/src/main/res/values-id/strings_sc.xml
	vector/src/main/res/values-sv/strings_sc.xml
2022-07-22 09:21:49 +02:00
..
androidTest/java/im/vector/app Merge pull request #6489 from vector-im/feature/bma/lib_opusencoder 2022-07-11 22:39:53 +02:00
debug Merge tag 'v1.4.28' into merge-v1.4.28 2022-07-17 18:52:55 +02:00
fdroid Merge tag 'v1.4.28' into merge-v1.4.28 2022-07-17 18:52:55 +02:00
gplay Merge tag 'v1.4.27-RC2' into merge-v1.4.27 2022-07-09 18:16:33 +02:00
main Merge remote-tracking branch 'weblate/sc' into sc 2022-07-22 09:21:49 +02:00
release Merge tag 'v1.4.27-RC2' into merge-v1.4.27 2022-07-09 18:16:33 +02:00
sharedTest/java/im/vector/app/test/shared
test/java/im/vector/app Merge pull request #6471 from vector-im/feature/adm/sharing-tests 2022-07-13 10:12:09 +01:00