Permalink
Browse files

I know we all love > but we can't all have them

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4678 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 127ee8c commit 822527102f3de694fd243c387f750bb5e74f143d @seckar seckar committed Aug 5, 2006
Showing with 0 additions and 1 deletion.
  1. +0 −1 actionpack/CHANGELOG
View
@@ -4,7 +4,6 @@
* Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 [pjhyett@gmail.com]
->>>>>>> .r4676
* Short documentation to mention use of Mime::Type.register. #5710 [choonkeat@gmail.com]
* Make controller_path available as an instance method. #5724 [jmckible@gmail.com]

0 comments on commit 8225271

Please sign in to comment.