diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 1 |
1 files changed, 0 insertions, 1 deletions
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] |