Merge branch 'master' of git://github.com/yiisoft/yii2
Showing
... | ... | @@ -78,13 +78,13 @@ |
"yiisoft/yii2-composer": "*", | ||
"ezyang/htmlpurifier": "4.6.*", | ||
"cebe/markdown": "0.9.*", | ||
"bower-asset/jquery": "~1.11 | ~2.1", | ||
"bower-asset/jquery.inputmask": "~3.1", | ||
"bower-asset/punycode": "~1.3", | ||
"bower-asset/yii2-pjax": "~2.0", | ||
"bower-asset/bootstrap": "~3.2", | ||
"bower-asset/jquery-ui": "~1.11", | ||
"bower-asset/typeahead.js": "~0.10" | ||
"bower-asset/jquery": "2.1.*@stable | ~2.1@stable | ~1.11@stable", | ||
"bower-asset/jquery.inputmask": "3.1.* | ~3.1", | ||
"bower-asset/punycode": "1.3.* | ~1.3", | ||
"bower-asset/yii2-pjax": "2.0.* | ~2.0", | ||
"bower-asset/bootstrap": "3.2.* | ~3.1", | ||
"bower-asset/jquery-ui": "1.11.*@stable | ~1.11@stable", | ||
"bower-asset/typeahead.js": "0.10.* | ~0.10" | ||
}, | ||
"require-dev": { | ||
"phpunit/phpunit": "3.7.*", | ||
... | ... | @@ -134,6 +134,9 @@ |
"framework/yii" | ||
], | ||
"extra": { | ||
"branch-alias": { | ||
"dev-master": "2.0.x-dev" | ||
}, | ||
"asset-installer-paths": { | ||
"npm-asset-library": "vendor/npm", | ||
"bower-asset-library": "vendor/bower" | ||
... | ... |
Please
register
or
sign in
to comment