mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-05 16:42:29 +03:00
Merge branch 'master' into derp
Conflicts: dist/css/bootstrap-theme.css.map dist/css/bootstrap.css.map docs/assets/js/raw-files.min.js docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap.css.map less/progress-bars.less less/theme.less
This commit is contained in:
@@ -114,7 +114,6 @@
|
||||
</div><!-- /.carousel -->
|
||||
|
||||
|
||||
|
||||
<!-- Marketing messaging and featurettes
|
||||
================================================== -->
|
||||
<!-- Wrap the rest of the page in another container to center all the content. -->
|
||||
|
||||
Reference in New Issue
Block a user