diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-04 19:15:40 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-04 19:15:40 +0000 |
commit | 00739dee173a675a9da94ec4c9c9e2866715fb41 (patch) | |
tree | 4254eb424a55e6100193ea0ab23bf669289af7c3 /activesupport/CHANGELOG | |
parent | 6e319ccce27d0855025eb69cb5224bd81cb41601 (diff) | |
download | rails-00739dee173a675a9da94ec4c9c9e2866715fb41.tar.gz rails-00739dee173a675a9da94ec4c9c9e2866715fb41.tar.bz2 rails-00739dee173a675a9da94ec4c9c9e2866715fb41.zip |
Fixed conflict with Glue gem #1606 [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1675 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/CHANGELOG')
-rw-r--r-- | activesupport/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 2f9948eb0e..97cf400dfe 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed conflict with Glue gem #1606 [Rick Olson] + * Added new rules to the Inflector to deal with more unusual plurals mouse/louse => mice/lice, information => information, ox => oxen, virus => viri, archive => archives #1571, #1583, #1490, #1599 [foamdino@gmail.com/others] * Fixed memory leak with Object#remove_subclasses_of, which inflicted a Rails application running in development mode with a ~20KB leak per request #1289 [c.r.mcgrath@gmail.com] |