Skip to content

Commit f18d82a

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-37714-ZF' into S53_bugs
2 parents 96e8737 + b7c7d5b commit f18d82a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"zendframework/zend-serializer": "2.4.0",
3131
"zendframework/zend-log": "2.4.0",
3232
"zendframework/zend-http": "2.4.0",
33-
"magento/zendframework1": "1.12.10",
33+
"magento/zendframework1": "1.12.13",
3434
"composer/composer": "1.0.0-alpha9",
3535
"monolog/monolog": "1.11.0",
3636
"oyejorge/less.php": "1.7.0.3",

composer.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)