]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Wed, 25 Jan 2012 09:23:50 +0000 (01:23 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 25 Jan 2012 09:23:50 +0000 (01:23 -0800)
commitf4f7296fa8b371ed06addd4e7d1f0662c01b2b76
treeee69214a6cbe07a619ce220f7746aba5d1b363e7
parentb8fa6cfacf61a02ab769b9031253c7b06111fa7c
parentc5103d0ad12c2b1bb1ca7f35c56e6126233f5e08
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/less.html
docs/templates/pages/less.mustache
docs/less.html
docs/templates/pages/less.mustache