diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 16:53:58 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 16:53:58 -0700 |
| commit | 7f6779c1d5e4ec7f642839caa7e86320720f77c8 (patch) | |
| tree | b6c7306a2a74efae0054445a2f41f5169a101422 /activesupport/lib | |
| parent | f5d720fb96f2e085acc4ed17f63272c4d38e567e (diff) | |
| parent | 6fee981fa4ea2654f825c58b58327fc15fddf3a6 (diff) | |
| download | rails-7f6779c1d5e4ec7f642839caa7e86320720f77c8.tar.gz rails-7f6779c1d5e4ec7f642839caa7e86320720f77c8.tar.bz2 rails-7f6779c1d5e4ec7f642839caa7e86320720f77c8.zip | |
Merge branch 'master' into cherry
Conflicts:
activesupport/lib/active_support.rb
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index f240cbf5e4..0879535487 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -51,6 +51,5 @@ module ActiveSupport end require 'active_support/vendor' -require 'active_support/json' I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml" |