]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6abb8c e3b98c5)
Merge branch 'v4-dev' into malkomich-v4-dev
authorMark Otto <markdotto@gmail.com>
Wed, 25 Jul 2018 00:25:12 +0000 (17:25 -0700)
committerMark Otto <markdotto@gmail.com>
Wed, 25 Jul 2018 00:25:12 +0000 (17:25 -0700)
1  2 
scss/_modal.scss patch | diff1 | diff2 | blob | history
scss/_variables.scss patch | diff1 | diff2 | blob | history
site/docs/4.1/components/modal.md patch | diff1 | diff2 | blob | history

diff --cc scss/_modal.scss
Simple merge
diff --cc scss/_variables.scss
Simple merge
diff --cc site/docs/4.1/components/modal.md
Simple merge
Mirror of https://github.com/twbs/bootstrap.git