]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
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)
commit4e55a867a02550030609dbf675aa1e00aeb92e9f
tree84472f76afce83188f287c7993167e93e16ab1ea
parent5cfde0d3a5819374e5f750b4fcfedfccc5c19889
parentbb1286a0ab073bce1d18f704d7ac0545ea76c6ef
Merge branch 'master' into derp

Conflicts:
docs/_includes/components/alerts.html
docs/_includes/getting-started/browser-device-support.html
docs/javascript/alerts.md