diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2016-10-04 10:00:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-04 10:00:14 +0100 |
| commit | 16bb6122e221d33780ab49ea98bd4253f25fbb4f (patch) | |
| tree | 91000c13c4809869b6b01aac489ef05074d50916 | |
| parent | c3005e0a31eaef3b169ff4460e22dd263a8006cf (diff) | |
| parent | 432cc58a2995ebce811b4a458dbe17ff317c8dba (diff) | |
| download | rails-16bb6122e221d33780ab49ea98bd4253f25fbb4f.tar.gz rails-16bb6122e221d33780ab49ea98bd4253f25fbb4f.tar.bz2 rails-16bb6122e221d33780ab49ea98bd4253f25fbb4f.zip | |
Merge pull request #26701 from kamipo/restore_gemfile_lock_entries
Restore missing Gemfile.lock entries
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 87edfa767c..14635a8cb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -190,6 +190,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) |