diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2016-01-18 11:40:42 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2016-01-18 11:40:42 -0300 |
| commit | eb2c0e23f9453b18e66e17668927705e1ed22f68 (patch) | |
| tree | 2d701d3aa7941b6760374d95f4160a0b90559273 | |
| parent | 721e45c90c79378fa854de4d16a3f154d1447d59 (diff) | |
| parent | 330469e7c7003d4475067d87d96b5dddca41c233 (diff) | |
| download | rails-eb2c0e23f9453b18e66e17668927705e1ed22f68.tar.gz rails-eb2c0e23f9453b18e66e17668927705e1ed22f68.tar.bz2 rails-eb2c0e23f9453b18e66e17668927705e1ed22f68.zip | |
Merge pull request #23088 from prathamesh-sonpatki/update-gemfile-lock
Checked in changes to Gemfile.lock on latest master
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4f17b7a81a..bcedeff385 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,7 +32,6 @@ PATH actioncable (5.0.0.beta1) actionpack (= 5.0.0.beta1) coffee-rails (~> 4.1.0) - concurrent-ruby (~> 1.0.0) em-hiredis (~> 0.3.0) faye-websocket (~> 0.10.0) redis (~> 3.0) @@ -145,7 +144,7 @@ GEM eventmachine (~> 1.0) hiredis (~> 0.5.0) erubis (2.7.0) - eventmachine (1.0.8) + eventmachine (1.0.9.1) execjs (2.6.0) faye-websocket (0.10.2) eventmachine (>= 0.12.0) |