merged branch marcw/feat-patch-changelog (PR #3788)

Commits ------- f5bc208 Updates CHANGELOG for commit f718859. Discussion ---------- Updates CHANGELOG for commit f718859.
symfony · Apr 5, 2012 · fec3d29 · fec3d29
2 parents 404e58f + f5bc208
commit fec3d29
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md
@@ -323,6 +323,8 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
  * Added basic session meta-data to the session to record session create time,
    last updated time, and the lifetime of the session cookie that was provided
    to the client.
+ * Request::getClientIp() method doesn't take a parameter anymore but bases
+   itself on the trustProxy parameter.
 
 ### HttpKernel