Merge branch 'master' into release

b63a6461 · 李福中 · d8825395 · 925831fd · b63a6461
Commit b63a6461 authored Aug 26, 2021 by 李福中
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

Gemfile.lock
+3 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -140,7 +140,9 @@ GEM
    marcel (0.3.3)
      mimemagic (~> 0.3.2)
    method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
    minitest (5.13.0)