Merge branch 'versions/3.0.0'

3.0.0 readiness
zendframework · Feb 3, 2016 · 22eb098 · 22eb098
2 parents 3afbb21 + aaae1e3
commit 22eb098
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 39 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.
 
-## 3.0.0 - TBD
+## 3.0.0 - 2016-02-03
 
 ### Added
 
@@ -45,42 +45,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.8.0 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.7.5 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.7.4 - 2015-10-15
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -22,8 +22,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev",
-            "dev-develop": "3.0-dev"
+            "dev-master": "3.0-dev",
+            "dev-develop": "3.1-dev"
         }
     },
     "autoload-dev": {