projects
/
zf2.biz
/
galerie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
dfd52ac
)
Merge pull request #91 from sasezaki/translate_ja
author
Evan Coury
<me@evancoury.com>
Thu, 19 Jul 2012 22:59:34 +0000
(15:59 -0700)
committer
Evan Coury
<me@evancoury.com>
Thu, 19 Jul 2012 22:59:34 +0000
(15:59 -0700)
adding not translated Japanese, fixed typo.
composer.json
patch
|
blob
|
history
vendor/ZF2
patch
|
blob
|
history
diff --git
a/composer.json
b/composer.json
index
a6b5c36
..
23b02cb
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#18c8e223f070deb07c17543ed938b54542aa0ed8"
+ "zendframework/zendframework": "dev-master#d6b0afe61149c6d0669743aab5c73285c42cd0db"
}
}
diff --git
a/vendor/ZF2
b/vendor/ZF2
index
18c8e22
..
d6b0afe
160000
(submodule)
--- a/
vendor/ZF2
+++ b/
vendor/ZF2
@@
-1
+1
@@
-Subproject commit 18c8e223f070deb07c17543ed938b54542aa0ed8
+Subproject commit d6b0afe61149c6d0669743aab5c73285c42cd0db