aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-06-10 22:00:55 +0200
committerXavier Noria <fxn@hashref.com>2010-06-10 22:00:55 +0200
commit63560660062d552d6bbebec007154f0c639bf865 (patch)
tree0ff7ee5c1a63815685e9640ca4a9ceafb7732178 /railties/CHANGELOG
parent59e89facc2264322bcab59c9a8622380b62d4d40 (diff)
parent61fc7a455099f179de88967f403f2038b9d3c821 (diff)
downloadrails-63560660062d552d6bbebec007154f0c639bf865.tar.gz
rails-63560660062d552d6bbebec007154f0c639bf865.tar.bz2
rails-63560660062d552d6bbebec007154f0c639bf865.zip
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/CHANGELOG')
-rw-r--r--railties/CHANGELOG6
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 61924745c8..c33a4d11dd 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,3 +1,9 @@
+*Rails 3.0.0 [Release Candidate] (unreleased)*
+
+* Abort generation/booting on Ruby 1.9.1. [fxn]
+* Made the rails command work even when you're in a subdirectory [Chad Fowler]
+
+
*Rails 3.0.0 [beta 4] (June 8th, 2010)*
* Version bump