Merge branch 'release/1.2.0'

zendframework · Oct 19, 2019 · b66064e · b66064e
2 parents 3137ae1 + 7140a3c
commit b66064e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.2.0 - TBD
+## 1.2.0 - 2019-10-19
 
 ### Added
 
@@ -30,28 +30,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 1.1.1 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 1.1.0 - 2018-04-30
 
 ### Added

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2018, Zend Technologies USA, Inc.
+Copyright (c) 2005-2019, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/composer.json b/composer.json
@@ -45,8 +45,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev",
-            "dev-develop": "1.2.x-dev"
+            "dev-master": "1.2.x-dev",
+            "dev-develop": "1.3.x-dev"
         },
         "zf": {
             "component": "Zend\\Mvc\\Plugin\\FlashMessenger"

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