]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
projects / thirdparty / bootstrap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a6f055e 270def4)
Merge branch 'master' of https://github.com/twitter/bootstrap
authorJacob Thornton <jacobthornton@gmail.com>
Wed, 16 Nov 2011 08:28:20 +0000 (00:28 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Wed, 16 Nov 2011 08:28:20 +0000 (00:28 -0800)
commit90f8eb6c144bbd409f196a0b33ec4ae2b47e1eb5
tree64e735a74d5256bcfd1769cc5b9c2a71402de22atree | snapshot
parenta6f055ee5e74e14ce28a5f3246d8132f680e63f5commit | diff
parent270def40f76b692d28c37126e94beb307161e264commit | diff
Merge branch 'master' of https://github.com/twitter/bootstrap

Conflicts:
bootstrap.css
bootstrap.css diff1 | diff2 | blob | history
Mirror of https://github.com/twbs/bootstrap.git