more on bootstrap upgrade

switchy · Nov 3, 2014 · a81482b · a81482b
1 parent 40368ee
commit a81482b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -82,7 +82,7 @@
  "bower-asset/jquery.inputmask": "3.1.*",
  "bower-asset/punycode": "1.3.*",
  "bower-asset/yii2-pjax": "2.0.*",
- "bower-asset/bootstrap": "3.2.* | 3.1.*",
+ "bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*",
  "bower-asset/jquery-ui": "1.11.*@stable",
  "bower-asset/typeahead.js": "0.10.*"
  },

diff --git a/framework/UPGRADE.md b/framework/UPGRADE.md
@@ -11,8 +11,9 @@ for both A and B.
 Upgrade from Yii 2.0.0
 ----------------------
 
-* Upgraded Twitter Bootstrap to version 3.3.x. If you need to use an older version (i.e. stick with 3.2.x) you can
- specify that in your `composer.json` by adding the following line in the `require` section:
+* Upgraded Twitter Bootstrap to [version 3.3.x](http:https://blog.getbootstrap.com/2014/10/29/bootstrap-3-3-0-released/).
+ If you need to use an older version (i.e. stick with 3.2.x) you can specify that in your `composer.json` by
+ adding the following line in the `require` section:
 
  ```json
  "bower-asset/bootstrap": "3.2.*",