From 41602a4c13ee344ba3d09236172878654dcff148 Mon Sep 17 00:00:00 2001
From: Thomas McDonald <tom@conceptcoding.co.uk>
Date: Fri, 24 May 2013 15:15:44 +0100
Subject: [PATCH] Update to 2.3.1.2

---
 CHANGELOG.md           | 9 ++++++++-
 README.md              | 4 ++--
 bootstrap-sass.gemspec | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00828da2..ae1c29b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,14 @@
 # Changelog
 
-## 2.3.1.1
+## 2.3.1.2
 
+* Fix changes to image url - *Gleb Mazovetskiy*
+* Copy _variables into project on Compass install - *Phil Thompson*
+* Add `bootstrap-affix` to the Compass template file - *brief*
+
+## 2.3.1.1 (yanked)
+
+* Change how image_url is handled internally - *Tristan Harward*
 * Fix some font variables not having `!default` - *Thomas McDonald*
 
 ## 2.3.0.0
diff --git a/README.md b/README.md
index 23c7545d..17340bd1 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ In your Gemfile:
 
 ```ruby
 gem 'sass-rails', '~> 3.2'
-gem 'bootstrap-sass', '~> 2.3.1.0'
+gem 'bootstrap-sass', '~> 2.3.1.2'
 ```
 
 `bundle install` and restart your server to make the files available.
@@ -123,7 +123,7 @@ Basically this means you should expect to append a separate patch version to the
 ### Bundler?
 
 ```ruby
-gem 'bootstrap-sass', '~> 2.3.1.0'
+gem 'bootstrap-sass', '~> 2.3.1.2'
 ```
 
 Don't use the standard `~> 2.x.y`. Your apps may break.
diff --git a/bootstrap-sass.gemspec b/bootstrap-sass.gemspec
index cfdd7bd8..7507cf75 100644
--- a/bootstrap-sass.gemspec
+++ b/bootstrap-sass.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "bootstrap-sass"
-  s.version = '2.3.1.1'
+  s.version = '2.3.1.2'
   s.authors = ["Thomas McDonald"]
   s.email = 'tom@conceptcoding.co.uk'
   s.summary = "Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass"