mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-08 17:22:31 +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:
@@ -113,7 +113,6 @@
|
||||
</div><!--/.container-->
|
||||
|
||||
|
||||
|
||||
<!-- Bootstrap core JavaScript
|
||||
================================================== -->
|
||||
<!-- Placed at the end of the document so the pages load faster -->
|
||||
|
||||
Reference in New Issue
Block a user