]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twbs/bootstrap
authorMark Otto <otto@github.com>
Mon, 17 Mar 2014 02:06:17 +0000 (19:06 -0700)
committerMark Otto <otto@github.com>
Mon, 17 Mar 2014 02:06:17 +0000 (19:06 -0700)
commitb7ab7998248696392d3d4c4b1335ef2b6b10d29f
treee23b555f45dd706a9fd3433681fc0c9b0b56193f
parent2a43e7e78a59c70e217383c12c9ef0482cabb163
parentc6ab3fc7d84450232f3024207015743ecdd929a4
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
dist/js/bootstrap.min.js
docs/dist/js/bootstrap.min.js
docs/assets/js/customize.min.js
test-infra/npm-shrinkwrap.canonical.json