diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-22 10:31:47 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-22 10:31:47 -0800 |
| commit | e68bc3f14ea93eabdd4274e66071b65debb5a0a8 (patch) | |
| tree | 223c11f38dac1217d8e7e3cd427fdf6018975a9d /railties/lib/rails.rb | |
| parent | 3cb46b40a0df1a1f4912625cc2be40b3d630f1f3 (diff) | |
| parent | e1935e3c0c35f8f1196239e2b1213c4436049fa5 (diff) | |
| download | rails-e68bc3f14ea93eabdd4274e66071b65debb5a0a8.tar.gz rails-e68bc3f14ea93eabdd4274e66071b65debb5a0a8.tar.bz2 rails-e68bc3f14ea93eabdd4274e66071b65debb5a0a8.zip | |
Merge commit 'origin/master' into mail
Diffstat (limited to 'railties/lib/rails.rb')
| -rw-r--r-- | railties/lib/rails.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index 43ece14a49..c23b67e321 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -1 +1,13 @@ +require "pathname" + +require 'rails/initializable' +require 'rails/application' +require 'rails/railties_path' +require 'rails/version' +require 'rails/rack' +require 'rails/paths' +require 'rails/core' +require 'rails/configuration' +require 'rails/deprecation' require 'rails/initializer' +require 'rails/plugin'
\ No newline at end of file |