diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-08-05 22:13:11 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-08-05 22:13:11 +0000 |
| commit | 822527102f3de694fd243c387f750bb5e74f143d (patch) | |
| tree | 484585cf6b5833f76a5a8b4b16526825b2e70f7b /actionpack/CHANGELOG | |
| parent | 127ee8c8f8103515929f31cf24fdc3d9b68d692d (diff) | |
| download | rails-822527102f3de694fd243c387f750bb5e74f143d.tar.gz rails-822527102f3de694fd243c387f750bb5e74f143d.tar.bz2 rails-822527102f3de694fd243c387f750bb5e74f143d.zip | |
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
Diffstat (limited to 'actionpack/CHANGELOG')
| -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] |