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

b6e00221 · Qiang Xue · db61885e · 8332e8c6 · b6e00221
Commit b6e00221 authored May 09, 2013 by Qiang Xue
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

composer.json composer.json +2 -2

No files found.
--- a/composer.json
+++ b/composer.json
@@ -64,10 +64,10 @@
 		"source": "https://github.com/yiisoft/yii2"
 	},
 	"config": {
-		"vendor-dir": "framework/vendor"
+		"vendor-dir": "yii/vendor"
 	},
 	"bin": [
-		"framework/yiic"
+		"yii/yiic"
 	],
 	"require": {
 		"php": ">=5.3.0",