Commit 66c2c6c0 by Klimov Paul

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

parents d0bf6e3a 1c428ec5
...@@ -61,7 +61,7 @@ ...@@ -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\\": ""}
......
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