Merge branch 'master' into australorp

[catagits/Catalyst-Runtime.git] / Changes

diff --git a/Changes b/Changes
index d334b25..8fd50ce 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,12 +1,14 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+5.90089_001 - TBA
+
 5.90084 - 2015-02-23
   - Small change to the way body parameters are created in order to prevent
     trying to create parameters twice.
   - Use new HTTP::Body and code updates to fix issue when POSTed params have
     non UTF-8 charset encodings or otherwise complex upload parts that are not
     file uploads. In these cases when Catalyst can't determine what the value of
-    a form upload is, will return an instance of Catalyst::Request::PartData will
+    a form upload is, will return an instance of Catalyst::Request::PartData with
     all the information need to figure it out.  Documentation about this corner
     case. For RT https://rt.cpan.org/Ticket/Display.html?id=101556
   - Two new application configuration parameters 'skip_body_param_unicode_decoding'
@@ -34,6 +36,7 @@
     test case to prevent regressions.
 
 5.90080 - 2015-01-09
+>>>>>>> master
   - Minor documentation corrections
   - Make the '79 development series stable