Merge branch 'release/1.6.0'

zendframework · Nov 22, 2019 · 9ad04e7 · 9ad04e7
2 parents 50acdb6 + 2fe3bcd
commit 9ad04e7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 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.6.0 - TBD
+## 1.6.0 - 2019-11-22
 
 ### Added
 
@@ -28,28 +28,6 @@ Releases prior to 1.2.0 did not have entries.
 
 - Nothing.
 
-## 1.5.1 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 1.5.0 - 2019-03-26
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -62,8 +62,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.5.x-dev",
-            "dev-develop": "1.6.x-dev"
+            "dev-master": "1.6.x-dev",
+            "dev-develop": "1.7.x-dev"
         }
     },
     "scripts": {

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