]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cfde0d bb1286a)
Merge branch 'master' into derp
authorMark Otto <otto@github.com>
Sun, 13 Jul 2014 00:56:30 +0000 (17:56 -0700)
committerMark Otto <otto@github.com>
Sun, 13 Jul 2014 00:56:30 +0000 (17:56 -0700)
Conflicts:
docs/_includes/components/alerts.html
docs/_includes/getting-started/browser-device-support.html

1  2 
docs/javascript/alerts.md patch | diff1 | diff2 | blob | history

diff --cc docs/javascript/alerts.md
Simple merge
Mirror of https://github.com/twbs/bootstrap.git