From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google

---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index fac7ee0..eceeb1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@
 .idea/workspace.xml
 .idea/
 *.properties
+local.properties

--
Gitblit v1.8.0