diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2016-09-20 16:55:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 16:55:41 +0100 |
| commit | 52a0ee4695c22f86b1e46a23b7b377846aea0994 (patch) | |
| tree | dbd0b8251d38baeb8e3f94cdbc7d92eedb07b80e | |
| parent | 8150c1260edb48c03dd686c0a74feee7d43c5479 (diff) | |
| parent | f88ed6020b3bbcd31f98dba36e22740cda06c276 (diff) | |
| download | rails-52a0ee4695c22f86b1e46a23b7b377846aea0994.tar.gz rails-52a0ee4695c22f86b1e46a23b7b377846aea0994.tar.bz2 rails-52a0ee4695c22f86b1e46a23b7b377846aea0994.zip | |
Merge pull request #26558 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 9e4c989edd..68c75997b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,6 +188,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) |