]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of github.com:twitter/bootstrap
authorMark Otto <markdotto@gmail.com>
Thu, 2 Feb 2012 00:45:25 +0000 (16:45 -0800)
committerMark Otto <markdotto@gmail.com>
Thu, 2 Feb 2012 00:45:25 +0000 (16:45 -0800)
commitf166c5a35b9a037fa0e314ce111812f4b7ef741e
tree0db9a2a3729291a6c2c57fcbc27105e3b81e9174
parent9b9e1d309bada7983434b092b40b088147a42a2e
parent87df2304083b7e2da0cc0d43e77a1199948fb3e3
Merge branch 'master' of github.com:twitter/bootstrap

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip