master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5f249464cd
schildichat-android/vector-app/src
History
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/java/im/vector/app Apply dual licenses: AGPL + Element Commercial to file headers. 2025-01-14 10:27:57 +01:00
debug Merge tag 'v1.6.30' into sc 2025-02-04 19:03:51 +01:00
fdroid Merge tag 'v1.6.30' into sc 2025-02-04 19:03:51 +01:00
gplay Merge tag 'v1.6.30' into sc 2025-02-04 19:03:51 +01:00
main Merge tag 'v1.6.30' into sc 2025-02-04 19:03:51 +01:00
nightly/res remove app_name from resource 2023-03-15 09:20:03 +01:00
release Merge tag 'v1.6.30' into sc 2025-02-04 19:03:51 +01:00