diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-10 00:33:32 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-10 00:33:32 +0000 |
| commit | 1ab84247ca4b80afbd82afe7539b3449636344c4 (patch) | |
| tree | 9ca5e3bee3a07b68c9d900ff129b69bc740405c2 /railties/CHANGELOG | |
| parent | b6fb79c531a0079274f7b459302e6290c9183f28 (diff) | |
| parent | 4458edc882b229ea44602da20a6440a6f233f1c8 (diff) | |
| download | rails-1ab84247ca4b80afbd82afe7539b3449636344c4.tar.gz rails-1ab84247ca4b80afbd82afe7539b3449636344c4.tar.bz2 rails-1ab84247ca4b80afbd82afe7539b3449636344c4.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/guides/files/stylesheets/main.css
railties/guides/rails_guides/generator.rb
railties/guides/source/index.erb.textile
Diffstat (limited to 'railties/CHANGELOG')
| -rw-r--r-- | railties/CHANGELOG | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 38c6f808e6..de506dfbbb 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,12 @@ +*2.3.1 [RC2] (March 5, 2009)* + +* Allow metal to live in plugins #2045 [Matthew Rudy] + + *2.3.0 [RC1] (February 1st, 2009)* +* Added metal [Josh Peek] + * Remove script/performance/request in favour of the performance integration tests. [Pratik Naik] To continue using script/performance/request, install the request_profiler plugin : |