]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Jul 2012 07:24:25 +0000 (00:24 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Jul 2012 07:24:25 +0000 (00:24 -0700)
commit5b2f2ed82181c651626b541aee6963f74bf8be31
tree31706cdec9278f49a03544385d45e8572af1f98f
parent4ea7c472358e2d77f76193ed3c1bafd641dd74ae
parent7ce048bccd618bbae794a9115861d1927664b8ed
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip

Conflicts:
docs/assets/css/docs.css
docs/javascript.html
docs/templates/pages/javascript.mustache
docs/assets/css/docs.css
docs/javascript.html
docs/templates/pages/javascript.mustache