aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-06-02 12:29:28 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-06-02 12:29:28 +0100
commit719aa13b0781d662673dba2225bc707fc4182b5e (patch)
tree057cabf17152a1ab0ccc749dd361eeaf754c38de /actionpack/CHANGELOG
parentad3c97cea6dd0714652db7d9b5b4d06b81e5c035 (diff)
parenta980eb8c7734f14109d8c2a02a88dafdf682e0dc (diff)
downloadrails-719aa13b0781d662673dba2225bc707fc4182b5e.tar.gz
rails-719aa13b0781d662673dba2225bc707fc4182b5e.tar.bz2
rails-719aa13b0781d662673dba2225bc707fc4182b5e.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG7
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 5c4bfbf3c9..9622029362 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,6 +1,9 @@
-* InstanceTag#default_time_from_options overflows to DateTime [Geoff Buesing]
+* Added Rack processor [Ezra Zygmuntowicz, Josh Peek]
+
-*2.1.0 RC1 (May 11th, 2008)*
+*2.1.0 (May 31st, 2008)*
+
+* InstanceTag#default_time_from_options overflows to DateTime [Geoff Buesing]
* Fixed that forgery protection can be used without session tracking (Peter Jones) [#139]