diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-03-04 05:31:48 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-03-04 05:31:48 +1030 |
| commit | bbba0649f529626a076c4247047b60cfbe86d5e4 (patch) | |
| tree | cdbf52c160399441574d1f13dd6587ee504e002d /Gemfile.lock | |
| parent | cd73632d9d47752013f46e775e59241215cfd8e9 (diff) | |
| parent | a373be9da45d4bee684ea03420212780ec1ef4b1 (diff) | |
| download | rails-bbba0649f529626a076c4247047b60cfbe86d5e4.tar.gz rails-bbba0649f529626a076c4247047b60cfbe86d5e4.tar.bz2 rails-bbba0649f529626a076c4247047b60cfbe86d5e4.zip | |
Merge pull request #23992 from matthewd/em-option
Support faye-websocket + EventMachine as an option
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3224c31a0b..90c15b4175 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,7 +131,7 @@ GEM erubis (2.7.0) eventmachine (1.0.9.1) execjs (2.6.0) - faye-websocket (0.10.2) + faye-websocket (0.10.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.9.10) |