From 95010d4a4c21cd53b78f51cbd518a315a8861fbc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 12 十月 2022 10:55:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev

---
 .editorconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 672defc..25b312e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{json,yml}]
+[*.{json,yml,yaml}]
 indent_size = 2
 
 [*.md]

--
Gitblit v1.9.3