Commit 9023c087 authored by Mark Otto's avatar Mark Otto

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

parents f5c13a3e e7a56df5
......@@ -14,7 +14,6 @@
"_*",
"docs-assets",
"examples",
"/fonts",
"js/tests",
"CNAME",
"CONTRIBUTING.md",
......
Markdown is supported
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