Merge branch 'main' into development

ForceTower · Oct 23, 2024 · 48033c8 · 48033c8
2 parents 0d9671e + d1b6330
commit 48033c8
Show file tree

Hide file tree

Showing 19 changed files with 3,502 additions and 76 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -84,3 +84,4 @@
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
 -dontwarn org.openjsse.net.ssl.OpenJSSE
 -dontwarn android.content.pm.PackageManager$PackageInfoFlags
+-dontwarn com.google.android.gms.common.annotation.NoNullnessRewrite