aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-08-15 02:04:25 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-08-15 02:04:25 +0000
commit5f3486c0b48081090c58940f5ed21a591c4cdf2f (patch)
treee87045e12ddce305a11166bff158651925b69a84 /actionpack/CHANGELOG
parent7678d123a7e46edcf418a6959b615e2387b7fad6 (diff)
downloadrails-5f3486c0b48081090c58940f5ed21a591c4cdf2f.tar.gz
rails-5f3486c0b48081090c58940f5ed21a591c4cdf2f.tar.bz2
rails-5f3486c0b48081090c58940f5ed21a591c4cdf2f.zip
cleanup
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4764 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 175d3f46bf..faa4f1cb08 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -8,7 +8,6 @@
* Tweak RoutingError message to show option diffs, not just missing named route significant keys. [Rick Olson]
->>>>>>> .r4761
* Invoke method_missing directly on hidden actions. Closes #3030. [Nicholas Seckar]
* Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading. [Rick Olson]