Commit b6e00221 by Qiang Xue

Merge branch 'master' of https://github.com/yiisoft/yii2

parents db61885e 8332e8c6
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"config": { "config": {
"vendor-dir": "framework/vendor" "vendor-dir": "yii/vendor"
}, },
"bin": [ "bin": [
"framework/yiic" "yii/yiic"
], ],
"require": { "require": {
"php": ">=5.3.0", "php": ">=5.3.0",
......
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