Bump to v3.3.7

bipicar · Jul 25, 2016 · 5d6b2eb · 5d6b2eb
1 parent 563a9ba
commit 5d6b2eb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.3.7
+
+* Allows jQuery 3.x in bower.json. [#1048](https://github.com/twbs/bootstrap-sass/issues/1048)
+* Adds the `style` and `sass` fields to package.json. [#1045](https://github.com/twbs/bootstrap-sass/issues/1045)
+* Adds Eyeglass support. [#1007](https://github.com/twbs/bootstrap-sass/pull/1007)
+
 ## 3.3.6
 
 * Bumps Sass dependency to 3.3.4+ to avoid compatibility issues with @at-root.

diff --git a/README.md b/README.md
@@ -323,9 +323,7 @@ The upstream versions vs the Bootstrap for Sass versions are:
 
 | Upstream |    Sass |
 |---------:|--------:|
-|    3.3.6 |   3.3.6 |
-|    3.3.5 |   3.3.5 |
-|    3.3.4 |   3.3.4 |
+|    3.3.4+ |   same |
 |    3.3.2 |   3.3.3 |
 | <= 3.3.1 | 3.3.1.x |
 

diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION       = '3.3.6'
+  VERSION       = '3.3.7'
   BOOTSTRAP_SHA = '0b9c4a4007c44201dce9a6cc1a38407005c26c86'
 end
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-sass",
-  "version": "3.3.6",
+  "version": "3.3.7",
   "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
   "main": "assets/javascripts/bootstrap.js",
   "style": "assets/stylesheets/_bootstrap.scss",

diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass
@@ -1,4 +1,4 @@
-// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.6):
+// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.7):
 
 //
 // Variables