diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-24 01:33:18 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-24 01:33:18 +0530 |
| commit | efd0bd3b7390ebb8526b981169025f2860f6a113 (patch) | |
| tree | 1cb3bcd8f9534f64e8a764af1010ce65303b42b0 /railties/lib/generators/rails/app/templates/config/locales/en.yml | |
| parent | f4571e3617ccd9cc9e5ee9f7431066bd80395e22 (diff) | |
| parent | 8ff2fb6f3aa6140f5a8bd018d5919a8a1e707cda (diff) | |
| download | rails-efd0bd3b7390ebb8526b981169025f2860f6a113.tar.gz rails-efd0bd3b7390ebb8526b981169025f2860f6a113.tar.bz2 rails-efd0bd3b7390ebb8526b981169025f2860f6a113.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'railties/lib/generators/rails/app/templates/config/locales/en.yml')
| -rw-r--r-- | railties/lib/generators/rails/app/templates/config/locales/en.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/locales/en.yml b/railties/lib/generators/rails/app/templates/config/locales/en.yml index f265c068d8..a747bfa698 100644 --- a/railties/lib/generators/rails/app/templates/config/locales/en.yml +++ b/railties/lib/generators/rails/app/templates/config/locales/en.yml @@ -2,4 +2,4 @@ # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. en: - hello: "Hello world"
\ No newline at end of file + hello: "Hello world" |