]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorfat <jacobthornton@gmail.com>
Thu, 16 May 2013 18:08:46 +0000 (11:08 -0700)
committerfat <jacobthornton@gmail.com>
Thu, 16 May 2013 18:08:46 +0000 (11:08 -0700)
commita4c16155a21c7bcad9b1d52e2141425cdb7df494
tree490759c71a56d0b54fb46d5ae56851074a31a992
parent14651035deda4d02a1ca02c6088c34f770f897f6
parentf3d857773455a940fca0c8d2ef1ca26982700031
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
Makefile
docs/_site/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.min.js
docs/customize.html
docs/docs.html
docs/customize.html