From: J. Shirley <jshirley+cpan@gmail.com>
Date: Mon, 17 Aug 2009 22:13:05 +0000 (+0000)
Subject: Conflict resolution
X-Git-Tag: 5.80008~14
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=3ecba1dfa9e0c63b9c667ca762660ffe67eebeb4;hp=365e0b9882e00cfcddc16b0a2a390c7821dd65c8

Conflict resolution
---

diff --git a/Changes b/Changes
index c63887a..f2a90f5 100644
--- a/Changes
+++ b/Changes
@@ -37,6 +37,8 @@
          as such by adding a _component_name accessor for all components
          which returns the component instance's name to be used when building
          actions etc.
+       - Adding X-Forwarded-Port to allow the frontend proxy to dictate the
+         frontend port (jshirley)
 
   Documentation:
        - Fix POD to refer to ->config(key => $val), rather than