Merge branch 'versions/3.0.0'

weierophinney · weierophinney · commit f625047c655f · 2016-01-13T14:57:41.000-06:00
3.0.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.
 
-## 3.0.0 - TBD
+## 3.0.0 - 2016-01-13
 
 ### Changed
 
diff --git a/composer.json b/composer.json
@@ -31,8 +31,8 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "3.0-dev"
+            "dev-master": "3.0-dev",
+            "dev-develop": "3.1-dev"
         }
     },
     "autoload-dev": {
