]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
projects / thirdparty / bootstrap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5ad5dde a139167)
Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip
authorJacob Thornton <jacobthornton@gmail.com>
Wed, 22 Feb 2012 07:18:18 +0000 (23:18 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Wed, 22 Feb 2012 07:18:18 +0000 (23:18 -0800)
commitf3b6cf1d6d65ccc640152aa4edb88cbea05a8b45
treeb8fff7c4434ad1ee48b4aa2e4afa24b844c0a717tree | snapshot
parent5ad5dde1e24f668cf9b720dd59fc2a7d4808c0b3commit | diff
parenta139167489e249345933b1e58cc7c53542abab97commit | diff
Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip

Conflicts:
docs/assets/bootstrap.zip
less/mixins.less
docs/assets/bootstrap.zip diff1 | diff2 | blob | history
docs/assets/css/bootstrap.css diff1 | diff2 | blob | history
less/mixins.less diff1 | diff2 | blob | history
Mirror of https://github.com/twbs/bootstrap.git