projects
/
zf2.biz
/
application_blanche.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'patch-2' of https://github.com/lsmith77/ZendSkeletonApplication into...
[zf2.biz/application_blanche.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index
c86e655
..
c44aa90
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#1736dd000849a08b9b1ff64bf4f9eb6532407432"
+ "zendframework/zendframework": "2.*"
}
}