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

This commit is contained in:
Mark Otto 2014-03-09 14:39:52 -07:00
commit f3dcd4dba4

View File

@ -20,7 +20,7 @@
"dist/fonts/glyphicons-halflings-regular.woff"
],
"ignore": [
"**/.*",
".*",
"_config.yml",
"CNAME",
"composer.json",