diff options
| author | Mark Otto <[email protected]> | 2013-02-05 22:42:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-05 22:42:54 -0800 |
| commit | 421f9f67c44d4b7c971b42808687ae7b71c99151 (patch) | |
| tree | 4aa1c698f535d8ae8f7aae7a4b6d396bc86906a4 /docs/getting-started.html | |
| parent | 6d21d8600739fe16e8993a11f82a4727065ca78a (diff) | |
| parent | 3b56227553f40cc567e161c68c64f1e315fd5241 (diff) | |
| download | bootstrap-421f9f67c44d4b7c971b42808687ae7b71c99151.tar.xz bootstrap-421f9f67c44d4b7c971b42808687ae7b71c99151.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less
Diffstat (limited to 'docs/getting-started.html')
0 files changed, 0 insertions, 0 deletions