bump to v3.1.1 and update changelog

twbs · Feb 13, 2014 · d9420c4 · d9420c4
1 parent 9b9365f
commit d9420c4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,17 @@
 # Changelog
 
+## 3.1.1.0
+
+- Updated Bower docs
+
 ## 3.1.0.2
 
-Compatibility with Rails 3.2.x. Bugfixes from upstream up to 7eb532262fbd1112215b5a547b9285794b5360ab.
+- #523: Rails 3.2 compatibility
+- Bugfixes from upstream up to 7eb532262fbd1112215b5a547b9285794b5360ab.
 
 ## 3.1.0.1
 
-* bugfixes
+- #518: `scale` mixin Sass compatibility issue
 
 ## 3.1.0.0
 

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `s
 
 ```ruby
 gem 'sass-rails', '>= 3.2' # sass-rails needs to be higher than 3.2
-gem 'bootstrap-sass', '~> 3.1.0'
+gem 'bootstrap-sass', '~> 3.1.1'
 ```
 
 `bundle install` and restart your server to make the files available through the pipeline.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "homepage": "https://github.com/twbs/bootstrap-sass",
   "authors": [
     "Thomas McDonald",

diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.1.0.2'
+  VERSION = '3.1.1.0'
   BOOTSTRAP_SHA = 'd8cfcad7c71a2b65325b36718c218fee4221e663'
 end