Skip to content

Commit

Permalink
Merge pull request #361 from clear-y/v6.1.2
Browse files Browse the repository at this point in the history
[Don't merge] v6.1.2 - preemtive PR
  • Loading branch information
corysimmons committed Sep 19, 2014
2 parents f3d2469 + b617938 commit 68c24d6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jeet",
"version": "6.1.1",
"version": "6.1.2",
"homepage": "http://jeet.gs",
"authors": [
"Cory Simmons <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"main": "stylus/jeet.js",
"version": "6.1.1",
"version": "6.1.2",
"description": "A grid system for humans.",
"keywords": [
"stylus",
Expand Down

0 comments on commit 68c24d6

Please sign in to comment.