]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.2-wip' into exploratory
authorMark Otto <markotto@twitter.com>
Mon, 1 Oct 2012 05:45:39 +0000 (22:45 -0700)
committerMark Otto <markotto@twitter.com>
Mon, 1 Oct 2012 05:45:39 +0000 (22:45 -0700)
commitbbd543db53cd8c5d295db67af2bc2517d5c11f1c
tree15b9e94bfb14becdb0fb24e95436816fe7ff6606
parentad96435d27de7661a158552ad088fd800fe66fe9
parentda43c7c27cb08a76775ad64b5caa210630d0c2cd
Merge branch '2.1.2-wip' into exploratory

Conflicts:
docs/getting-started.html
docs/templates/pages/getting-started.mustache
docs/assets/css/bootstrap.css
docs/base-css.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/templates/pages/base-css.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
less/buttons.less