Commit 30afb514 by Qiang Xue

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

parents b55ce764 4466df7d
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
], ],
"require": { "require": {
"yiisoft/yii2": "*", "yiisoft/yii2": "*",
"twbs/bootstrap": "3.1.*" "twbs/bootstrap": "3.1.* | 3.0.*"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
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