Merge a990881 into 80f32b9

nning · Jan 20, 2018 · dde5783 · dde5783
2 parents 80f32b9 + a990881
commit dde5783
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -82,6 +82,8 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     colorize (0.8.1)
+    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.0.5-java)
     config (1.4.0)
       activesupport (>= 3.0)
       deep_merge (~> 1.1.1)
@@ -121,8 +123,8 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    faker (1.8.4)
-      i18n (~> 0.5)
+    faker (1.8.7)
+      i18n (>= 0.7)
     faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
@@ -138,7 +140,8 @@ GEM
     hashie (3.5.6)
     highline (1.7.8)
     hike (1.2.3)
-    i18n (0.8.6)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     inherited_resources (1.4.1)
       has_scope (~> 0.6.0.rc)
       responders (~> 1.0.0.rc)