3.1.0 readiness

Author: weierophinney

CHANGELOG.md

@@ -2,11 +2,13 @@
 
 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 - 2018-01-04
 
 ### Added
 
-- Nothing.
+- [#35](https://github.com/zendframework/zend-json/pull/35) and
+  [#39](https://github.com/zendframework/zend-json/pull/39) add support for PHP
+  7.1 and PHP 7.2.
 
 ### Deprecated
 
@@ -22,25 +24,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
-
-## 3.0.1 - TBD
-
-### Added
-
-- [#39](https://github.com/zendframework/zend-json/pull/39) adds support for PHP
-  7.1 and PHP 7.2.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
 - [#38](https://github.com/zendframework/zend-json/pull/38) provides a fix to
   `Json::prettyPrint()` to ensure that empty arrays and objects are printed
   without newlines.

composer.json

@@ -42,8 +42,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev",
-            "dev-develop": "3.1-dev"
+            "dev-master": "3.1.x-dev",
+            "dev-develop": "3.2.x-dev"
         }
     },
     "scripts": {