Merge branch 'master' into release

Genymobile · Nov 1, 2023 · 5000368 · 5000368
2 parents 855ae4a + 90ca46e
commit 5000368
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ build/
 .gradle/
 /x/
 local.properties
+/scrcpy-server