]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of https://github.com/lerks/bootstrap into lerks-3.0.0-wip
authorMark Otto <otto@github.com>
Wed, 14 Aug 2013 22:33:38 +0000 (15:33 -0700)
committerMark Otto <otto@github.com>
Wed, 14 Aug 2013 22:33:38 +0000 (15:33 -0700)
commit00867616605363ab2f08a8603d898d4fa68fd7a3
treef988a3b2daf2f1474113e8bf1e062842a63d6aaf
parentc8c9274728e811857255ecdb22cfdf1c258ef9ac
parent1e1b5c737ba33c0e7a86634bcb3baedc70498884
Merge branch '3.0.0-wip' of https://github.com/lerks/bootstrap into lerks-3.0.0-wip

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css