From: Kyle Spraggs Date: Fri, 29 Jun 2012 23:03:36 +0000 (-0500) Subject: Updated composer. X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=11d85a5606dc34c822298653277b83691543a933;p=zf2.biz%2Fgalerie.git Updated composer. Updated zf2 master (composer and submodule). --- diff --git a/composer.json b/composer.json index 082446d..c148a38 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#9abb910f375d369ae89b06bd27bfa3cb11926664" + "zendframework/zendframework": "dev-master#da641b8599bc4567241c162baa6b14987ae2297a" } } diff --git a/composer.phar b/composer.phar index 4b03778..92e7242 100755 Binary files a/composer.phar and b/composer.phar differ diff --git a/vendor/ZF2 b/vendor/ZF2 index 9abb910..da641b8 160000 --- a/vendor/ZF2 +++ b/vendor/ZF2 @@ -1 +1 @@ -Subproject commit 9abb910f375d369ae89b06bd27bfa3cb11926664 +Subproject commit da641b8599bc4567241c162baa6b14987ae2297a