Commit be8d5243 authored by Mark Otto's avatar Mark Otto

Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

parents a9bf1e6e 1f30faac
...@@ -34,3 +34,4 @@ nbproject ...@@ -34,3 +34,4 @@ nbproject
.CVS .CVS
.idea .idea
node_modules node_modules
dist
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