Merge branch 'release/3.1.0'

zendframework · Aug 11, 2016 · caadff9 · caadff9
2 parents a50ec47 + 2588081
commit caadff9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Changelog
 
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
+All notable changes to this project will be documented in this file, in reverse
+chronological order by release.
 
-## 3.1.0 - TBD
+## 3.1.0 - 2016-08-11
 
 ### Added
 
@@ -22,24 +23,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 3.0.1 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 3.0.0 - 2016-06-21
 
 ### Added

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