From 0b357bcd7c472c91227093239f180a28638c57a4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:33:07 +0800
Subject: [PATCH] Merge branch '1.5.2' into 1.5.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