Merge branch 'master' of github.com:twbs/bootstrap
Conflicts: dist/css/bootstrap.css.map docs/assets/js/customize.min.js docs/dist/css/bootstrap.css.map
Showing
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
This diff is collapsed.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff is collapsed.
less/mixins/alerts.less
0 → 100644
less/mixins/buttons.less
0 → 100644
less/mixins/clearfix.less
0 → 100644
less/mixins/forms.less
0 → 100644
less/mixins/gradients.less
0 → 100644
less/mixins/grid.less
0 → 100644
less/mixins/hide-text.less
0 → 100644
less/mixins/image.less
0 → 100644
less/mixins/labels.less
0 → 100644
less/mixins/list-group.less
0 → 100644
less/mixins/nav-divider.less
0 → 100644
less/mixins/opacity.less
0 → 100644
less/mixins/pagination.less
0 → 100644
less/mixins/panels.less
0 → 100644
less/mixins/resize.less
0 → 100644
less/mixins/size.less
0 → 100644
less/mixins/tab-focus.less
0 → 100644
less/mixins/table-row.less
0 → 100644
Please register or sign in to comment