diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-14 19:28:05 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-14 19:28:05 +0000 |
| commit | 6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3 (patch) | |
| tree | 3da8d75101aabe3c1d90d0582505ec1480c9d885 /railties/lib/rails/all.rb | |
| parent | 77bf78b3b78a41d4f2f6e733f5c9c00608c0adba (diff) | |
| parent | a1b60696e2b13cbe94d748444cc0da37b190fbb8 (diff) | |
| download | rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.tar.gz rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.tar.bz2 rails-6f3c5f67870a625b8be4de6e34e8d0d2f5d2b5e3.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
railties/README
railties/guides/source/active_support_core_extensions.textile
railties/guides/source/getting_started.textile
railties/lib/generators/rails/app/templates/README
Diffstat (limited to 'railties/lib/rails/all.rb')
| -rw-r--r-- | railties/lib/rails/all.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index 1a0b4a8d73..82775b7e3b 100644 --- a/railties/lib/rails/all.rb +++ b/railties/lib/rails/all.rb @@ -1,11 +1,8 @@ require "rails" %w( - active_support - active_model active_record action_controller - action_view action_mailer active_resource rails/test_unit @@ -14,4 +11,4 @@ require "rails" require "#{framework}/railtie" rescue LoadError end -end
\ No newline at end of file +end |