]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorfat <jacobthornton@gmail.com>
Thu, 18 Jul 2013 08:08:19 +0000 (01:08 -0700)
committerfat <jacobthornton@gmail.com>
Thu, 18 Jul 2013 08:08:19 +0000 (01:08 -0700)
commit6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340
tree8480da0e7c249bf59f6a13e9f108d1429e1d4741
parent4b40ee692dc066f2ad3c4dd96af67a83475f5cbe
parent181b27677492050adceaa52fe972115515759f07
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js
docs/assets/css/bootstrap.css
docs/javascript.html