Merge branch 'master' into pr/12412

Conflicts: dist/css/bootstrap-theme.css.map dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css test-infra/npm-shrinkwrap.canonical.json
2026-06-05 16:42:29 +03:00 · 2014-02-11 09:50:40 -08:00
parent b36d19c3c6 2cef0af211
commit 8551f42ae2
147 changed files with 3433 additions and 2540 deletions
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v3.0.3 (http://getbootstrap.com)
+ * Bootstrap v3.1.0 (http://getbootstrap.com)
 * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */