fixing up some merge fun

[catagits/Catalyst-Runtime.git] / Changes

diff --git a/Changes b/Changes
index 006dc06..823a30a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 # This file documents the revision history for Perl extension Catalyst.
 
-5.7013
+5.7014  2008-XX-XX XX:XX:XX
+         - Addition of .conf in restart regex in Catalyst::Engine::HTTP::Restarter::Watcher
         - Provide backwards compatability methods in Catalyst::Stats
         - Fix subdirs for scripts that run in subdirs more than one level deep.
         - Added test and updated docs for handling the Authorization header