diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-28 20:32:09 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-28 20:32:09 -0700 |
| commit | c4d90e42042e66faee9ff2a32625cb250c15b4ed (patch) | |
| tree | 56a68dd53e99f130cb64d34a4ef9ba24c8a50f7d /railties/lib/rails | |
| parent | bbd2caeaf916980b4c55ffce2b8fd9097082f27a (diff) | |
| parent | 77088196e99bcfe0be3729c38537cf0b8fd06461 (diff) | |
| download | rails-c4d90e42042e66faee9ff2a32625cb250c15b4ed.tar.gz rails-c4d90e42042e66faee9ff2a32625cb250c15b4ed.tar.bz2 rails-c4d90e42042e66faee9ff2a32625cb250c15b4ed.zip | |
Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable
Missed commits from 3-2-stable
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 5fdfe8f04e..676662b9f5 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -15,7 +15,7 @@ source 'https://rubygems.org' # To use Jbuilder templates for JSON # gem 'jbuilder' -# Use unicorn as the web server +# Use unicorn as the app server # gem 'unicorn' # Deploy with Capistrano |