diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-05 23:05:41 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-05 23:05:41 -0800 |
commit | 34f34e300980dfef0b8a8d4515ef84ce1f168417 (patch) | |
tree | deb3d4895488366d66811c4c2b6b9bc0359b5bcb /actionpack/CHANGELOG | |
parent | 6f8ed1cd3fa595a59d7a19d8d383836b456ac803 (diff) | |
parent | be098f840614bbb71fe26f0e2b4c064b6866c076 (diff) | |
download | rails-34f34e300980dfef0b8a8d4515ef84ce1f168417.tar.gz rails-34f34e300980dfef0b8a8d4515ef84ce1f168417.tar.bz2 rails-34f34e300980dfef0b8a8d4515ef84ce1f168417.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r-- | actionpack/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 546311e078..41e3be8b35 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *Edge* +* Fix a syntax error in current_page?() that was prevent matches against URL's with multiple query parameters #1385, #1868 [chris finne/Andrew White] + * Added localized rescue template when I18n.locale is set (ex: public/404.da.html) #1835 [José Valim] |