Merge branch 'versions/2.7.0'

2.7.0 readines
Slamdunk · Mar 1, 2016 · 073d391 · 073d391
2 parents 4a84a31 + 78a446b
commit 073d391
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 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.
 
-## 2.7.0 - TBD
+## 2.7.0 - 2016-03-01
 
 ### Added
 
@@ -83,24 +83,6 @@ All notable changes to this project will be documented in this file, in reverse
   - The `ViewManager` implementations were updated, and most functionality
     within separated into discrete factories.
 
-## 2.6.4 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.6.3 - 2016-02-23
 
 ### Added

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