Merge remote-tracking branch 'upstream/pull/2683'

diff --git a/Gemfile.lock b/Gemfile.lock
index 3b47153b7480abf1a0c6a15f36f5885b25bc2220..5bd65a630b28c1981857449a3ef4a76627537641 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -243,7 +243,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.3.0)
+    json (2.3.1)
     jwt (2.2.1)
     kgio (2.11.3)
     kramdown (2.3.0)