Merging develop to master in preparation for 3.2.0 release.

Author: weierophinney

CHANGELOG.md

@@ -2,11 +2,12 @@
 
 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.
+- [#637](https://github.com/zendframework/zend-expressive/pull/637) adds support for zendframework/zend-diactoros 2.0.0. You may use either
+  a 1.Y or 2.Y version of that library with Expressive applications.
 
 ### Changed
 

composer.json

@@ -41,7 +41,7 @@
         "phpstan/phpstan-strict-rules": "^0.9",
         "phpunit/phpunit": "^7.0.1",
         "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-diactoros": "^1.7.1",
+        "zendframework/zend-diactoros": "^1.7.1 || ^2.0",
         "zendframework/zend-expressive-aurarouter": "^3.0",
         "zendframework/zend-expressive-fastroute": "^3.0",
         "zendframework/zend-expressive-zendrouter": "^3.0",
@@ -78,8 +78,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": {
             "config-provider": "Zend\\Expressive\\ConfigProvider"