From 477221bc6d42764831c55797b8ee287207953115 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 18 十二月 2023 15:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/.gitignore b/.gitignore
index b19a568..9dd0fcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-/ardLog/
+/log/
+/ruoyi-ui
+/server/mediamtx/mediamtx.yml

--
Gitblit v1.9.3