3.1.2

* Bumping version for Pull #27
atomicpages · Apr 27, 2017 · c76ce41 · c76ce41
1 parent b5b526e
commit c76ce41
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -5,7 +5,7 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
-indent_style = tab
+indent_style = space
 tab_width = 4
 
 [*.{yml}]

diff --git a/README.md b/README.md
@@ -291,6 +291,10 @@ Skeleton Sass 3 offers a far more portable solution in order to adapt to new way
 
 Changelog
 ---------
+### 3.1.2
+* Merging in pull request [dirkolbrich](https://github.com/dirkolbrich)
+	* Fixes duplicate `normalize.css` in transpiled output
+
 ### 3.1.1
 * Forgot to add the grid for `Wing` theme :)
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "skeleton-sass",
-	"version": "3.1.1",
+	"version": "3.1.2",
 	"author": "Dennis Thompson",
 	"homepage": "http://atomicpages.github.io/skeleton-sass/",
 	"repository": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "skeleton-sass-official",
-	"version": "3.1.1",
+	"version": "3.1.2",
 	"description": "Skeleton Sass is a highly modular version of Skeleton CSS",
 	"main": "skeleton/core/_config.scss",
 	"scripts": {

diff --git a/skeleton/core/_config.scss b/skeleton/core/_config.scss
@@ -1,5 +1,5 @@
 ////
-/// Skeleton Sass 3.1.0
+/// Skeleton Sass 3.1.2
 /// @author Dennis Thompson
 ////