Commit a42710ad by Vladimir Zbrailov

Merge branch 'master' of git://github.com/yiisoft/yii2 into get-headers

parents 53647d8b c4db587b
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
"minimum-stability": "dev", "minimum-stability": "dev",
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"phpdocumentor/reflection": "1.0.2" "phpdocumentor/reflection": "dev-master | >1.0.2"
}, },
"autoload": { "autoload": {
"psr-4": { "yii\\apidoc\\": "" } "psr-4": { "yii\\apidoc\\": "" }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment