1.5.0 readiness

zendframework · Aug 22, 2017 · 1d23172 · 1d23172
2 parents 70c3be2 + 55ff330
commit 1d23172
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 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.5.0 - TBD
+## 1.5.0 - 2017-08-22
 
 ### Added
 
@@ -62,28 +62,6 @@ All notable changes to this project will be documented in this file, in reverse
   `Uri` class provides user-info within the URI authority; the value is now
   correctly percent-encoded , per RFC 3986 Section 3.2.1.
 
-## 1.4.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 1.4.1 - 2017-08-17
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -18,8 +18,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.4-dev",
-      "dev-develop": "1.5-dev"
+      "dev-master": "1.5-dev",
+      "dev-develop": "1.6-dev"
     }
   },
   "require": {

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