Merge branch 'master' into fix-12154

Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2026-06-05 16:42:29 +03:00 · 2014-02-08 16:52:22 -08:00
parent 4787a69efb 7f88009394
commit e9199718d6
160 changed files with 13088 additions and 10844 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)
 */