aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG
diff options
context:
space:
mode:
authorMike Gunderloy <MikeG1@larkfarm.com>2009-03-24 20:06:59 -0500
committerMike Gunderloy <MikeG1@larkfarm.com>2009-03-24 20:06:59 -0500
commitfab9d3b59dc87faec96aa01ce89402a9c3e57df8 (patch)
treefc40fe92aac64a926ba5edd868a031b28f320c61 /railties/CHANGELOG
parent4e27ca4c28432cd735a8ccb82bbaff37941a9d3b (diff)
parent0e6b9695aff6500ad48c4dd9ab61343d7090b030 (diff)
downloadrails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.tar.gz
rails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.tar.bz2
rails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.zip
Merge branch 'master' of git@github.com:lifo/docrails
Conflicts: railties/guides/source/2_3_release_notes.textile
Diffstat (limited to 'railties/CHANGELOG')
-rw-r--r--railties/CHANGELOG7
1 files changed, 3 insertions, 4 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index de506dfbbb..98e3a861e8 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,9 +1,8 @@
-*2.3.1 [RC2] (March 5, 2009)*
-
-* Allow metal to live in plugins #2045 [Matthew Rudy]
+*2.3.2 [Final] (March 15, 2009)*
+* Remove outdated script/plugin options [Pratik Naik]
-*2.3.0 [RC1] (February 1st, 2009)*
+* Allow metal to live in plugins #2045 [Matthew Rudy]
* Added metal [Josh Peek]