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

This commit is contained in:
Klimov Paul
2014-10-10 16:50:43 +03:00

View File

@@ -61,7 +61,7 @@
"bower-asset/jquery": "2.1.*@stable | 1.11.*@stable", "bower-asset/jquery": "2.1.*@stable | 1.11.*@stable",
"bower-asset/jquery.inputmask": "3.1.*", "bower-asset/jquery.inputmask": "3.1.*",
"bower-asset/punycode": "1.3.*", "bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": "2.0.*" "bower-asset/yii2-pjax": ">=2.0.1"
}, },
"autoload": { "autoload": {
"psr-4": {"yii\\": ""} "psr-4": {"yii\\": ""}