From a81482b9672d49e33e21e32da18580427a58bf68 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Tue, 4 Nov 2014 00:35:57 +0100 Subject: [PATCH] more on bootstrap upgrade --- composer.json | 2 +- framework/UPGRADE.md | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 03b04f5..58b87a6 100644 --- 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 index f6179f4..0925e48 100644 --- 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://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.*",