Merging develop to master in preparation for 3.2.0 release.

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.1 - TBD
+## 3.2.0 - 2018-09-27
 
 ### Added
 
-- Nothing.
+- [#262](https://github.com/zendframework/zend-expressive-skeleton/pull/262) adds support for zendframework/zend-diactoros 2.0. Users may use either
+  the 1.Y or 2.Y series, but 2.0 will be installed by default in new
+  applications.
 
 ### Changed
 

composer.json

@@ -20,8 +20,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1.x-dev",
-            "dev-develop": "3.2.x-dev"
+            "dev-master": "3.2.x-dev",
+            "dev-develop": "3.3.x-dev"
         },
         "zf": {
             "component-whitelist": [
@@ -43,7 +43,7 @@
         "php": "^7.1",
         "zendframework/zend-component-installer": "^2.1.1",
         "zendframework/zend-config-aggregator": "^1.0",
-        "zendframework/zend-diactoros": "^1.7.1",
+        "zendframework/zend-diactoros": "^1.7.1 || ^2.0",
         "zendframework/zend-expressive": "^3.0.1",
         "zendframework/zend-expressive-helpers": "^5.0",
         "zendframework/zend-stdlib": "^3.1"