diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-06-26 20:54:15 +0400 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-06-26 20:54:15 +0400 |
| commit | a5f5954268779ce0faf7607b3c35191a8d0fdfe6 (patch) | |
| tree | 3d204cee121904b5af376e75e53cb6c96e0b0236 | |
| parent | 3b9a620e36e016d28c8257babb96fa3f4584962e (diff) | |
bump to v3.2.0.0v3.2.0
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | bower.json | 2 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | lib/bootstrap-sass/version.rb | 2 | ||||
| -rw-r--r-- | package.json | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fb5be3b0..c667c834 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 3.2.0.0 (unreleased) +## 3.2.0.0 - Assets (Sass, JS, fonts) moved from `vendor/assets` to `assets`. `bootstrap.js` now contains concatenated JS. - Compass generator now copies JS and fonts, and provides a better default `styles.sass`. @@ -13,7 +13,7 @@ Please see the appropriate guide for your environment of choice: In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `sass-rails` gem is present - it is added to new Rails applications by default. ```ruby -gem 'bootstrap-sass', '~> 3.1.1' +gem 'bootstrap-sass', '~> 3.2.0' gem 'sass-rails', '>= 3.2' ``` @@ -1,6 +1,6 @@ { "name": "bootstrap-sass", - "version": "3.1.1", + "version": "3.2.0", "homepage": "https://github.com/twbs/bootstrap-sass", "authors": [ "Thomas McDonald", diff --git a/composer.json b/composer.json index 4066adf2..2927a17b 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "license": "MIT", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "3.2.x-dev" } } } diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index 976ce0e4..37919cb1 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap - VERSION = '3.1.1.1' + VERSION = '3.2.0.0' BOOTSTRAP_SHA = 'c068162161154a4b85110ea1e7dd3d7897ce2b72' end diff --git a/package.json b/package.json index f772395e..10229fb4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-sass", - "version": "3.1.1", + "version": "3.2.0", "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.", "main": "index.js", "repository": { |