diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-10-06 12:11:38 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-10-06 12:11:38 +0100 |
| commit | c954d54e2f36bb53ced5e3655adc071dd233797e (patch) | |
| tree | d84bf4bf51f65a1c817089c6fe37c3e9f20420d0 /railties/lib/rails/railtie.rb | |
| parent | f2b41914d6be935182d37e0c0d491352ac3de043 (diff) | |
| parent | d40ca9cce241a8083756c993d6c99a79e62e050e (diff) | |
| download | rails-c954d54e2f36bb53ced5e3655adc071dd233797e.tar.gz rails-c954d54e2f36bb53ced5e3655adc071dd233797e.tar.bz2 rails-c954d54e2f36bb53ced5e3655adc071dd233797e.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'railties/lib/rails/railtie.rb')
| -rw-r--r-- | railties/lib/rails/railtie.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb index 09650789ac..2b68a3c453 100644 --- a/railties/lib/rails/railtie.rb +++ b/railties/lib/rails/railtie.rb @@ -83,7 +83,7 @@ module Rails # # class MyRailtie < Rails::Railtie # # Customize the ORM - # config.generators.orm :my_railtie_orm + # config.app_generators.orm :my_railtie_orm # # # Add a to_prepare block which is executed once in production # # and before each request in development |