diff options
| author | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-25 09:50:01 +1100 |
|---|---|---|
| committer | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-25 09:50:01 +1100 |
| commit | 4e96442c4e404141830b2d7f0d850b6556190b39 (patch) | |
| tree | a3ca088ad9d68b5be9ace4d431375bb3fd4ea045 /railties/lib/rails/all.rb | |
| parent | a74a655648618a6ed568b9b4ef3a17a8970e7774 (diff) | |
| parent | 396003fc48d7c0ba206ad059646c7414bee22a36 (diff) | |
| download | rails-4e96442c4e404141830b2d7f0d850b6556190b39.tar.gz rails-4e96442c4e404141830b2d7f0d850b6556190b39.tar.bz2 rails-4e96442c4e404141830b2d7f0d850b6556190b39.zip | |
Merge branch 'master' of git://github.com/rails/rails
Conflicts:
actionmailer/lib/action_mailer/mail_helper.rb
railties/lib/rails/configuration.rb
Diffstat (limited to 'railties/lib/rails/all.rb')
| -rw-r--r-- | railties/lib/rails/all.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index 7dfe2b8b63..b8292a9b7e 100644 --- a/railties/lib/rails/all.rb +++ b/railties/lib/rails/all.rb @@ -1,6 +1,7 @@ require "rails" %w( + active_support active_model active_record action_controller |