Commit f3dcd4db authored by Mark Otto's avatar Mark Otto
Browse files

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

parents 9920251c bc7e6a3f
3 merge requests!28721Hot test,!22103test,!25326Adjust examples
Showing with 1 addition and 1 deletion
+1 -1
......@@ -20,7 +20,7 @@
"dist/fonts/glyphicons-halflings-regular.woff"
],
"ignore": [
"**/.*",
".*",
"_config.yml",
"CNAME",
"composer.json",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment