]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c053f23 7633d4c)
Merge pull request #17259 from twbs/v4gc
authorMark Otto <markd.otto@gmail.com>
Wed, 2 Sep 2015 03:16:22 +0000 (20:16 -0700)
committerMark Otto <markd.otto@gmail.com>
Wed, 2 Sep 2015 03:16:22 +0000 (20:16 -0700)
v4: Conditional predefined grid classes

1  2 
scss/_grid.scss patch | diff1 | diff2 | blob | history
scss/_variables.scss patch | diff1 | diff2 | blob | history

diff --cc scss/_grid.scss
Simple merge
diff --cc scss/_variables.scss
Simple merge
Mirror of https://github.com/twbs/bootstrap.git