From a8e7a009d22f787046954b9e043363940deca3da Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Mon, 18 Mar 2013 18:18:55 -0300 Subject: Fix changelog conflicts and remove release dates [ci skip] --- actionpack/CHANGELOG.md | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'actionpack/CHANGELOG.md') diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 79ee22921c..2104018106 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -4,7 +4,11 @@ Fixes GH#3512. *Juan Barreneche* -* No changes. + +* Fix `ActionDispatch::Request#formats` when the Accept request-header is an + empty string. Fix #7774 [Backport #8977, #9541] + + *Soylent + Maxime Réty* ## Rails 3.2.13 ## @@ -26,16 +30,6 @@ *Olek Janiszewski* -<<<<<<< HEAD -* Fix `ActionDispatch::Request#formats` when the Accept request-header is an - empty string. Fix #7774 [Backport #8977, #9541] - - *Soylent + Maxime Réty* - -## Rails 3.2.13.rc1 (Feb 17, 2013) ## - -======= ->>>>>>> 3-2-13 * Determine the controller#action from only the matched path when using the shorthand syntax. Previously the complete path was used, which led to problems with nesting (scopes and namespaces). -- cgit v1.2.3