Conflict resolution

diff --git a/Changes b/Changes
index c63887a..f2a90f5 100644 (file)
--- 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