1.2.0 readiness

- Adds release date for 1.2.0 to CHANGELOG - Updates branch alias for dev-master to 1.2.x-dev
zendframework · Jun 25, 2018 · bb03241 · bb03241
1 parent 7d048a4
commit bb03241
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 Releases prior to 1.2.0 did not have entries.
 
-## 1.2.0 - TBD
+## 1.2.0 - 2018-06-25
 
 ### Added
 

diff --git a/composer.json b/composer.json
@@ -56,7 +56,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-master": "1.2.x-dev"
         }
     },
     "scripts": {

diff --git a/composer.lock b/composer.lock