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
..
java/im/vector/app/config	Merge tag 'v1.6.30' into sc	2025-02-04 19:03:51 +01:00
res/values	Merge remote-tracking branch 'CicadaCinema/fallback-turn-server' into sc	2023-04-24 12:02:18 +02:00
AndroidManifest.xml	Bump gradle from 7.2.2 to 7.3.1 (#7364)	2022-10-17 09:14:28 +02:00