From c76ce417a86508d19446bac741e3094aae096256 Mon Sep 17 00:00:00 2001 From: Dennis Thompson Date: Thu, 27 Apr 2017 12:41:22 -0700 Subject: [PATCH] 3.1.2 * Bumping version for Pull #27 --- .editorconfig | 2 +- README.md | 4 ++++ bower.json | 2 +- package.json | 2 +- skeleton/core/_config.scss | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index ba6e189..baed3af 100644 --- 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 index 8344315..ff38eda 100644 --- 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 index 499e73e..387c1dd 100644 --- 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 index 07aeb08..70cacb2 100644 --- 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 index 5742682..3097706 100644 --- 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 ////