From a70d0dfe221e06381b6e290d1dab85c9ab4fdc31 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 三月 2024 08:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

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

--
Gitblit v1.9.3