From 822527102f3de694fd243c387f750bb5e74f143d Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Sat, 5 Aug 2006 22:13:11 +0000 Subject: 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 --- actionpack/CHANGELOG | 1 - 1 file changed, 1 deletion(-) (limited to 'actionpack/CHANGELOG') diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 3f738c32bc..c345755db1 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -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] -- cgit v1.2.3