Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master

Mark Otto authored 11 years ago

Conflicts:
	dist/css/bootstrap.min.css

fc0e7686

History Find file

Name	Last commit	Last update
..
alerts.less
badges.less
bootstrap.less
breadcrumbs.less
button-groups.less
buttons.less
carousel.less
close.less
code.less
component-animations.less
dropdowns.less
forms.less
glyphicons.less
grid.less
input-groups.less
jumbotron.less
labels.less
list-group.less
media.less
mixins.less
modals.less
navbar.less
navs.less
normalize.less
pager.less
pagination.less
panels.less
popovers.less
print.less
progress-bars.less
responsive-utilities.less
scaffolding.less
tables.less
theme.less
thumbnails.less
tooltip.less
type.less
utilities.less
variables.less
wells.less

Menu

Explore