Merge branch 'hotfix/179'

Close #179 Fixes #178
zendframework · Dec 10, 2018 · 0428d6b · 0428d6b
2 parents 96a7c2f + 8573a54
commit 0428d6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.11.1 - TBD
+## 2.11.1 - 2018-12-10
 
 ### Added
 
-- Nothing.
+- [#179](https://github.com/zendframework/zend-view/pull/179) adds `^3.0` to the zendframework/zend-json constraints, allowing v3
+  releases to be used with zend-view.
 
 ### Changed
 

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
     "require": {
         "php": "^5.6 || ^7.0",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-        "zendframework/zend-json": "^2.6.1",
+        "zendframework/zend-json": "^2.6.1 || ^3.0",
         "zendframework/zend-loader": "^2.5",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },