resolve conflict

[catagits/Catalyst-Runtime.git] / Changes

diff --git a/Changes b/Changes
index 452584f..61c4c79 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,10 @@
 # This file documents the revision history for Perl extension Catalyst.
 
-  - Add test that env does not get trampled (Arthur Axel fREW Schmidt)
+5.90099 - 2015-08-XX
+  - Document using namespace::autoclean with controllers that have actions
+    with type constraints.
+  - Look for type constraints in super classes and consumed roles.
+  - Change the way the stash middleware works to no longer localize $psgi_env.
 
 5.90098 - 2015-08-11
   - Fix for RT#106373 (Issue when you try to install and also have an old