reuniting latest release with recent changes

PerlDancer · Jun 28, 2014 · b907e07 · b907e07
1 parent 96864bd
commit b907e07
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,13 +1,17 @@
 {{$NEXT}}
 
     [ BUG FIXES ]
-    * GH #550, #555: Allow the content type to be set when using send_file
-      as per the documentation. (Russell Jenkins, Steven Humphrey)
     * GH #538, #539: Coerce propogated exceptions to strings within Error object.
       (Steven Humphrey)
     * GH #531: Generate valid HTML when show_errors is true from Error objects.
       (Steven Humphrey)
 
+0.142000  2014-06-24 15:16:42CEST+0200 Europe/Amsterdam
+
+    [ BUG FIXES ]
+    * GH #550, #555: Allow the content type to be set when using send_file
+      as per the documentation. (Russell Jenkins, Steven Humphrey)
+
     [ ENHANCEMENTS ]
     * GH #512, #520, #602: Pass all settings into JSON serializer engine.
       (Jakob Voss, Russell Jenkins)

diff --git a/dist.ini b/dist.ini
@@ -5,7 +5,7 @@ copyright_holder = Alexis Sukrieh
 copyright_year   = 2014
 main_module = lib/Dancer2.pm
 
-version = 0.141000
+version = 0.142000
 
 [NextRelease]
 filename = Changes