2.6.0 readiness

weierophinney · weierophinney · commit fb998b9487ea · 2018-04-10T12:08:10.000-05:00
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.6.0 - TBD
+## 2.6.0 - 2018-04-10
 
 ### Added
 
diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5.x-dev",
-            "dev-develop": "2.6.x-dev"
+            "dev-master": "2.6.x-dev",
+            "dev-develop": "2.7.x-dev"
         }
     },
     "autoload-dev": {
diff --git a/composer.lock b/composer.lock
