diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-08-13 16:30:07 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-08-13 16:30:07 -0700 |
| commit | bf2b9d2de3f85e880e5afa980e6fd65b1f07557c (patch) | |
| tree | 41545ddaa2ab78f4f70bd847be99550c8c52b4f8 /RELEASING_RAILS.rdoc | |
| parent | acfdb18d92c3ab6b80023b643f89f3ce3cab6840 (diff) | |
| parent | f566fb32c49a81636ca341f376f99ef230d71d99 (diff) | |
| download | rails-bf2b9d2de3f85e880e5afa980e6fd65b1f07557c.tar.gz rails-bf2b9d2de3f85e880e5afa980e6fd65b1f07557c.tar.bz2 rails-bf2b9d2de3f85e880e5afa980e6fd65b1f07557c.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
RELEASING_RAILS.rdoc
actionpack/lib/sprockets/railtie.rb
actionpack/test/template/sprockets_helper_test.rb
activerecord/test/cases/calculations_test.rb
railties/guides/source/3_1_release_notes.textile
railties/guides/source/active_resource_basics.textile
railties/guides/source/command_line.textile
Diffstat (limited to 'RELEASING_RAILS.rdoc')
| -rw-r--r-- | RELEASING_RAILS.rdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/RELEASING_RAILS.rdoc b/RELEASING_RAILS.rdoc index e3d3f67237..4a9a875bfa 100644 --- a/RELEASING_RAILS.rdoc +++ b/RELEASING_RAILS.rdoc @@ -30,7 +30,7 @@ Do not release with Red AWDwR tests. Having git dependencies indicates that we depend on unreleased code. Obviously rails cannot be released when it depends on unreleased code. Contact the authors of those particular gems and work out a release date that -suites them. +suits them. === Contact the security team (either Koz or tenderlove) |