Merge branch 'release-2.5'

Updates ZendXml to 1.0.1, to address ZF2015-06 (see http://framework.zend.com/security/advisory/ZF2015-06)
vicular · Aug 3, 2015 · 0993994 · 0993994
2 parents 926de5b + 6babe86
commit 0993994
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
         "zendframework/zend-version": "~2.5.0",
         "zendframework/zend-view": "~2.5.0",
         "zendframework/zend-xmlrpc": "~2.5.0",
-        "zendframework/zendxml": "~1.0"
+        "zendframework/zendxml": "^1.0.1"
     },
     "suggest": {
         "zendframework/zend-ldap": "zend-ldap component ~2.5.0, if you need LDAP features"