2.12.0 readiness

- Adds CHANGELOG entry for #33 - Sets release date in CHANGELOG for 2.12.0 - Updates branch-aliases: - dev-master => 2.12.x-dev - dev-develop => 2.13.x-dev Signed-off-by: Matthew Weier O'Phinney <[email protected]>
laminas · Jun 23, 2020 · 48bd06f · 48bd06f
1 parent 66d41de
commit 48bd06f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,11 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.12.0 - TBD
+## 2.12.0 - 2020-06-23
 
 ### Added
 
-- Nothing.
+- [#33](https://github.com/laminas/laminas-http/pull/33) adds a new header type, `Laminas\Http\Header\ContentSecurityPolicyReportOnly`, mapping to Content-Security-Policy-Report-Only headers, which can be used for experimenting with policies without impacting your application.
 
 ### Changed
 

diff --git a/composer.json b/composer.json
@@ -21,8 +21,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.11.x-dev",
-            "dev-develop": "2.12.x-dev"
+            "dev-master": "2.12.x-dev",
+            "dev-develop": "2.13.x-dev"
         }
     },
     "require": {