Merge branch 'master' into boulox-responsive-embed

Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js docs/css.html docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2026-06-05 16:42:29 +03:00 · 2014-03-06 22:40:25 -08:00
parent f4dd6221d4 7e299c6a49
commit 12c619f5b9
210 changed files with 22656 additions and 14558 deletions
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v3.0.3 (http://getbootstrap.com)
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
 * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */