Update changelog with current 2.1.0.0 changes

thomas-mcdonald · thomas-mcdonald · commit 30e4345252e0 · 2012-09-01T17:45:06.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.0.0
+* Updated to Bootstrap 2.1
+* Changed some mixin names to be more consistent. Nested mixins in Less are separated by a `-` when they are flattened in Sass.
+
 ## 2.0.4.1
 * Fix `.row-fluid > spanX` nesting
 * Small Javascript fixes for those staying on the 2.0.4 release
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Enjoy.
 In your Gemfile:
 
     gem 'sass-rails', '~> 3.1'
-    gem 'bootstrap-sass', '~> 2.0.4.1'
+    gem 'bootstrap-sass', '~> 2.1.0.0'
 
 #### CSS
 
