schildichat-android/vector/src
SpiritCroc 48302d4c12 Merge tag 'v1.6.30' into sc
tag

Change-Id: I65447b029a4a06268bc0f2110232a427a9274c3a

Conflicts:
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
2025-02-04 19:03:51 +01:00
..
androidTest Apply dual licenses: AGPL + Element Commercial to file headers. 2025-01-14 10:27:57 +01:00
debug/res/drawable
main Merge tag 'v1.6.30' into sc 2025-02-04 19:03:51 +01:00
release/res/drawable
sharedTest/java/im/vector/app/test/shared Apply dual licenses: AGPL + Element Commercial to file headers. 2025-01-14 10:27:57 +01:00
test Merge tag 'v1.6.30' into sc 2025-02-04 19:03:51 +01:00