Merge branch 'hotfix/12'

Close #13 Fixes #12
zendframework · Feb 4, 2016 · 4429ca5 · 4429ca5
2 parents e99712e + b70919f
commit 4429ca5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.6.1 - TBD
+## 2.6.1 - 2016-02-04
 
 ### Added
 
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#13](https://github.com/zendframework/zend-tag/pull/13) updates the
+  zend-stdlib dependency to `^2.7 || ^3.0`, instead of just `^3.0`, allowing
+  it to work with users of zf2 v2 versions. Since the functionality consumed is
+  present and unchanged in both versions, this is a safe constraint.
 
 ## 2.6.0 - 2016-02-03
 

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
     "require": {
         "php": "^5.5 || ^7.0",
         "zendframework/zend-escaper": "^2.5",
-        "zendframework/zend-stdlib": "^3.0"
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",