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

30afb514 · Qiang Xue · b55ce764 · 4466df7d · 30afb514
Commit 30afb514 authored Apr 22, 2014 by Qiang Xue
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

composer.json extensions/bootstrap/composer.json +1 -1

No files found.
--- a/extensions/bootstrap/composer.json
+++ b/extensions/bootstrap/composer.json
@@ -19,7 +19,7 @@
    ],
    "require": {
        "yiisoft/yii2": "*",
-        "twbs/bootstrap": "3.1.*"
+        "twbs/bootstrap": "3.1.* | 3.0.*"
    },
    "autoload": {
        "psr-4": {