From 971a24a9e58a21bc306897fd3ad63012a399f7db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 23 五月 2025 14:07:18 +0800
Subject: [PATCH] Merge branch '1.2.1' into 1.2.0_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