From 3b4e0e485233d44ee3a247bf34c1ca1bfd276c90 Mon Sep 17 00:00:00 2001 From: Kyle Spraggs Date: Fri, 29 Jun 2012 17:48:24 -0500 Subject: [PATCH] Updated composer.json to latest master. Updated ZF2 submodule to latest master. --- composer.json | 2 +- vendor/ZF2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 132fc4e..082446d 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,6 @@ "homepage": "http://framework.zend.com/", "require": { "php": ">=5.3.3", - "zendframework/zendframework": "dev-master#6bf5dfff1160e6266d8924ab6fefb678ac56f44d" + "zendframework/zendframework": "dev-master#9abb910f375d369ae89b06bd27bfa3cb11926664" } } diff --git a/vendor/ZF2 b/vendor/ZF2 index 6bf5dff..9abb910 160000 --- a/vendor/ZF2 +++ b/vendor/ZF2 @@ -1 +1 @@ -Subproject commit 6bf5dfff1160e6266d8924ab6fefb678ac56f44d +Subproject commit 9abb910f375d369ae89b06bd27bfa3cb11926664 -- 1.7.10.4