Merge branch 'master' of github.com:twbs/bootstrap

802e5caf · Mark Otto · 700d7e7b · a6a97e1b · 802e5caf
Commit 802e5caf authored Aug 23, 2013 by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

bower.json bower.json +1 -1

No files found.
--- a/bower.json
+++ b/bower.json
 {
  "name": "bootstrap",
  "version": "3.0.0",
-  "main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css"],
+  "main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"],
  "ignore": [
      "**/.*"
  ],