projects
/
zf2.biz
/
application_blanche.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
7353810
)
Update for ZF2 RC6
author
Evan Coury
<me@evancoury.com>
Wed, 29 Aug 2012 19:14:42 +0000
(12:14 -0700)
committer
Evan Coury
<me@evancoury.com>
Wed, 29 Aug 2012 19:14:42 +0000
(12:14 -0700)
composer.json
patch
|
blob
|
history
vendor/ZF2
patch
|
blob
|
history
diff --git
a/composer.json
b/composer.json
index
9addf3f
..
c86e655
100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-9,6
+9,6
@@
"homepage": "http://framework.zend.com/",
"require": {
"php": ">=5.3.3",
- "zendframework/zendframework": "dev-master#9ddaaa6a2ddccf03044895391847d0283db542df"
+ "zendframework/zendframework": "dev-master#1736dd000849a08b9b1ff64bf4f9eb6532407432"
}
}
diff --git
a/vendor/ZF2
b/vendor/ZF2
index
9ddaaa6
..
1736dd0
160000
(submodule)
--- a/
vendor/ZF2
+++ b/
vendor/ZF2
@@
-1
+1
@@
-Subproject commit 9ddaaa6a2ddccf03044895391847d0283db542df
+Subproject commit 1736dd000849a08b9b1ff64bf4f9eb6532407432