Merge pull request #361 from clear-y/v6.1.2

[Don't merge] v6.1.2 - preemtive PR
mojotech · Sep 19, 2014 · 68c24d6 · 68c24d6
2 parents f3d2469 + b617938
commit 68c24d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 6.1.2
+- Fixes
+  - Critical bug in Scss port that caused nested columns to have incorrect gutters.
+  - `column-width()` and `column-gutter()` no longer ignore column nesting.
+
 ### 6.1.1
 - Fixes
   - By adding `cycle`/`uncycle` to `span` we are now able to clear floated elements so unequal height columns display as expected.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jeet",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "homepage": "http://jeet.gs",
   "authors": [
     "Cory Simmons <[email protected]>",

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     }
   ],
   "main": "stylus/jeet.js",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "A grid system for humans.",
   "keywords": [
     "stylus",