diff options
author | Prathamesh Sonpatki <csonpatki@gmail.com> | 2016-01-17 19:26:10 +0530 |
---|---|---|
committer | Prathamesh Sonpatki <csonpatki@gmail.com> | 2016-01-17 19:26:10 +0530 |
commit | 330469e7c7003d4475067d87d96b5dddca41c233 (patch) | |
tree | 6d87fe1361e98a48a8a688d970354b3bb6644c23 /Gemfile.lock | |
parent | 5d1b7c3b441654e8008dcd303f5367883ec660a6 (diff) | |
download | rails-330469e7c7003d4475067d87d96b5dddca41c233.tar.gz rails-330469e7c7003d4475067d87d96b5dddca41c233.tar.bz2 rails-330469e7c7003d4475067d87d96b5dddca41c233.zip |
Checked in changes to Gemfile.lock on latest master
- Eventmachine version gets updated when `bundle` is run locally.
Diffstat (limited to 'Gemfile.lock')
-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) |