Merge branch 'master' into australorp

[catagits/Catalyst-Runtime.git] / Changes

diff --git a/Changes b/Changes
index db97404..8fd50ce 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 # 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.
@@ -34,6 +36,7 @@
     test case to prevent regressions.
 
 5.90080 - 2015-01-09
+>>>>>>> master
   - Minor documentation corrections
   - Make the '79 development series stable