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

This commit is contained in:
Qiang Xue
2014-04-22 12:43:01 -04:00

View File

@ -19,7 +19,7 @@
],
"require": {
"yiisoft/yii2": "*",
"twbs/bootstrap": "3.1.*"
"twbs/bootstrap": "3.1.* | 3.0.*"
},
"autoload": {
"psr-4": {