diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-19 21:05:37 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-19 21:05:37 +1100 |
| commit | 2107921000f4a186fed36e676d1ac089c8be1f99 (patch) | |
| tree | 42f2188f058f8401d57f0d4c72063689a93e0419 /railties/bin | |
| parent | ccb7d9def3c20037c9ed5989d8cae1ed68763f4f (diff) | |
| parent | ed8501ef16fb2f5e4bd4d987740f5e5f62978400 (diff) | |
| download | rails-2107921000f4a186fed36e676d1ac089c8be1f99.tar.gz rails-2107921000f4a186fed36e676d1ac089c8be1f99.tar.bz2 rails-2107921000f4a186fed36e676d1ac089c8be1f99.zip | |
Merge branch 'master' of git://github.com/rails/rails into rails
Diffstat (limited to 'railties/bin')
| -rwxr-xr-x | railties/bin/rails | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/bin/rails b/railties/bin/rails index b8b2d6188f..afcd9fd0be 100755 --- a/railties/bin/rails +++ b/railties/bin/rails @@ -22,6 +22,6 @@ ARGV << "--help" if ARGV.empty? require 'rails/generators' -require 'rails/generators/rails/app/app_generator' +require 'generators/rails/app/app_generator' Rails::Generators::AppGenerator.start |