Update changelog

nelmio · Jul 29, 2013 · c83f7ab · c83f7ab
1 parent 849f60a
commit c83f7ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 1.2.0 (2013-07-29)
+
+  * Added Content-Security-Policy (CSP) 1.0 support
+  * Added forced_ssl.whitelist property to define URLs that do not need to be force-redirected
+  * Fixed session loss bug on 404 URLs in the CookieSessionHandler
+
 ### 1.1.0 (2013-03-27)
 
   * Added a cookie session storage (use only if really needed, and combine it with `encrypted_cookie`)

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-master": "1.2.x-dev"
         }
     },
     "target-dir": "Nelmio/SecurityBundle"