diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-11-02 18:14:16 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-11-02 18:14:16 +0000 |
| commit | 4559840a32e7d3b0602c0a0e5f984375a5dd078d (patch) | |
| tree | ffb71ffe24132b68e661c02a6b171008b5d06889 /activesupport | |
| parent | 88d9b32496140c9a00b8c1e1e55c48bd6f653756 (diff) | |
| download | rails-4559840a32e7d3b0602c0a0e5f984375a5dd078d.tar.gz rails-4559840a32e7d3b0602c0a0e5f984375a5dd078d.tar.bz2 rails-4559840a32e7d3b0602c0a0e5f984375a5dd078d.zip | |
Resolved the conflict
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5407 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 98cc8a1635..8460539367 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -2,6 +2,10 @@ * Update dependencies to allow constants to be defined alongside their siblings. A common case for this is AR model classes with STI; user.rb might define User, Administrator and Guest for example. [Nicholas Seckar] +* next_week respects DST changes. #6483 [marclove] + +* Update dependencies to allow constants to be defined alongside their siblings. A common case for this is AR model classes with STI; user.rb might define User, Administrator and Guest for example. [Nicholas Seckar] + * next_week respects DST changes. #6483, #5617, #2353, #2509, #4551 [marclove, rabiedenharn, rails@roetzel.de, jsolson@damogran.org, drbrain@segment7.net] * Expose methods added to Enumerable in the documentation, such as group_by. Closes #6170. [sergeykojin@gmail.com, Marcel Molina Jr.] |