From af73e3cb15c966129221009f1de35dea8de6578e Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Fri, 7 Dec 2012 06:02:43 +0000
Subject: Revert "Invert precedence of content in ActionDispatch::Static"

This reverts commit c59734f756b79c39486c45273d2cc5d42cd0c864.
---
 actionpack/CHANGELOG.md | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'actionpack/CHANGELOG.md')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 43880f2412..b57408ede3 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,11 +1,4 @@
 ## Rails 4.0.0 (unreleased) ##
-
-*   Invert precedence in `ActionDispatch::Static` so that dynamic content is preferred.
-    This prevents precompiled assets inadvertently being included twice when running
-    in development mode. Fixes #6421
-
-    *Andrew White*
-
 *   Add :if / :unless conditions to fragment cache:
 
         <%= cache @model, if: some_condition(@model) do %>
-- 
cgit v1.2.3