diff options
| author | José Valim <jose.valim@gmail.com> | 2010-06-20 00:12:54 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-06-20 00:12:54 +0200 |
| commit | 72725d7b7fefa1231cf63bddf8faa48a44f71295 (patch) | |
| tree | 555d743b8ec704d2cf720d6807eac725d0d64176 /activesupport/lib/active_support | |
| parent | 0247995d05b3cd3ff5fe32d5fbd8fdd866646909 (diff) | |
| parent | 728b9eccad99d22028577e8b06433e8344b15d01 (diff) | |
| download | rails-72725d7b7fefa1231cf63bddf8faa48a44f71295.tar.gz rails-72725d7b7fefa1231cf63bddf8faa48a44f71295.tar.bz2 rails-72725d7b7fefa1231cf63bddf8faa48a44f71295.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/json/backends/yajl.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/backends/yajl.rb b/activesupport/lib/active_support/json/backends/yajl.rb index d76f8b03e4..64e50e0d87 100644 --- a/activesupport/lib/active_support/json/backends/yajl.rb +++ b/activesupport/lib/active_support/json/backends/yajl.rb @@ -1,4 +1,4 @@ -require 'yajl-ruby' unless defined?(Yajl) +require 'yajl' unless defined?(Yajl) module ActiveSupport module JSON |