aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-11-20 08:52:48 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-11-20 08:52:48 +0100
commit206c5643aae40b0884d42fdb8caeb3f763936fa9 (patch)
tree608f5cc7daab7b58b3d159429c595303e7e1c7d4 /railties/CHANGELOG
parentfb1eebac940d0648d1640d20a24f085d901d6f30 (diff)
parent20a346170cf3922d16e265487cfb1abcc85383c1 (diff)
downloadrails-206c5643aae40b0884d42fdb8caeb3f763936fa9.tar.gz
rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.tar.bz2
rails-206c5643aae40b0884d42fdb8caeb3f763936fa9.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/CHANGELOG')
-rw-r--r--railties/CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 2af9946c69..52ddc5c464 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,4 +1,4 @@
-*2.3.0/3.0*
+*2.3.0 [Edge]*
* Added config.i18n settings gatherer to config/environment, auto-loading of all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale [DHH]