aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-12-27 03:49:17 +1030
committerGitHub <noreply@github.com>2016-12-27 03:49:17 +1030
commit1c2abad7e8eeb6ff480304ad7fe9d18ea7581781 (patch)
tree8886c1d4a14cb41981a32be6f04f13326349e970
parent774be3ea3b9d25ab69daf11c5071deaf053d7d5b (diff)
parent821e17de66e6a34fd03098ebd579f5766b40a836 (diff)
downloadrails-1c2abad7e8eeb6ff480304ad7fe9d18ea7581781.tar.gz
rails-1c2abad7e8eeb6ff480304ad7fe9d18ea7581781.tar.bz2
rails-1c2abad7e8eeb6ff480304ad7fe9d18ea7581781.zip
Merge pull request #27459 from kamipo/restore_gemfile_lock_entries
Restore missing Gemfile.lock entries
-rw-r--r--Gemfile.lock2
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index cb6774d79c..e8ddc9e6f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -193,6 +193,8 @@ GEM
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.9.14)
+ ffi (1.9.14-x64-mingw32)
+ ffi (1.9.14-x86-mingw32)
globalid (0.3.7)
activesupport (>= 4.1.0)
hiredis (0.6.1)