php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-25 11:10:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Qiang Xue
2014-09-22 11:38:46 -04:00
parent 34a2c590e4 1e5c48957d
commit 3697682a8e
21 changed files with 446 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
framework/composer.json
View File

@@ -58,15 +58,20 @@
"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/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"
},
"autoload": {
"psr-4": {"yii\\": ""}
},
"bin": [
"yii"
]
],
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
}
}