diff options
| author | Mark Otto <[email protected]> | 2015-05-27 15:49:55 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-05-27 15:49:55 -0700 |
| commit | 663576a7ae77fb3f6143ce59ea16511cdaf8e9c3 (patch) | |
| tree | 4c205f99d57e85308abc01ee431b6008bdf8c641 /scss/_grid.scss | |
| parent | bd971c49b0883452af2e1278a8628eaf351504a1 (diff) | |
| parent | 3fe894ba3620c7e5d2e040f83948488d1911aedc (diff) | |
| download | bootstrap-663576a7ae77fb3f6143ce59ea16511cdaf8e9c3.tar.xz bootstrap-663576a7ae77fb3f6143ce59ea16511cdaf8e9c3.zip | |
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.css.map
docs/assets/css/docs.min.css
Diffstat (limited to 'scss/_grid.scss')
| -rw-r--r-- | scss/_grid.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scss/_grid.scss b/scss/_grid.scss index 583c00eac..9e12e163a 100644 --- a/scss/_grid.scss +++ b/scss/_grid.scss @@ -127,4 +127,4 @@ .col-xl-bottom { align-self: flex-end; } } -}
\ No newline at end of file +} |