Merge branch 'versions/2.6.0'

weierophinney · weierophinney · commit 864f04447be9 · 2016-02-24T15:33:58.000-06:00
2.6.0 readiness
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 - 2016-02-24
 
 ### Added
 
diff --git a/composer.json b/composer.json
@@ -41,8 +41,8 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "3.0-dev"
+            "dev-master": "2.6-dev",
+            "dev-develop": "2.7-dev"
         }
     },
     "autoload-dev": {
