Merge remote-tracking branch 'origin/release/12.0' into dev

3 years ago · 3f64fe2818
parent d732c174cb bee1e375cf
commit 3f64fe2818
1 changed files with 1 additions and 1 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -345,7 +345,7 @@ GEM
      open4 (~> 1.3)
    coderay (1.1.3)
    colored2 (3.1.2)
-    commonmarker (0.23.2)
+    commonmarker (0.23.4)
    compare-xml (0.66)
      nokogiri (~> 1.8)
    concurrent-ruby (1.1.9)