Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit 0428d6b

Browse files
committed
Merge branch 'hotfix/179'
Close #179 Fixes #178
2 parents 96a7c2f + 8573a54 commit 0428d6b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5-
## 2.11.1 - TBD
5+
## 2.11.1 - 2018-12-10
66

77
### Added
88

9-
- Nothing.
9+
- [#179](https://github.com/zendframework/zend-view/pull/179) adds `^3.0` to the zendframework/zend-json constraints, allowing v3
10+
releases to be used with zend-view.
1011

1112
### Changed
1213

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"require": {
1616
"php": "^5.6 || ^7.0",
1717
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
18-
"zendframework/zend-json": "^2.6.1",
18+
"zendframework/zend-json": "^2.6.1 || ^3.0",
1919
"zendframework/zend-loader": "^2.5",
2020
"zendframework/zend-stdlib": "^2.7 || ^3.0"
2121
},

0 commit comments

Comments
 (0)