]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
fix crappy merge
authorJacob Thornton <jacobthornton@gmail.com>
Mon, 22 Aug 2011 05:05:07 +0000 (22:05 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Mon, 22 Aug 2011 05:05:07 +0000 (22:05 -0700)
commit25e21bab96bb784cc90db37a19b5681cc41da429
tree5b320d39f40eea2c266e2fe27fdea18b4d2e92b6
parente11c49cc48a70de1728ed18ca425db74e79c9938
fix crappy merge
docs/index.html