aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-07-30 13:25:49 -0700
committerMark Otto <[email protected]>2012-07-30 13:25:49 -0700
commitbe8d5243f4942a83d9c3e08c5d9f4419536c72c2 (patch)
treee07ebd06150b6055de47ebb94b00d9964e44894a
parenta9bf1e6e354e9833ba365b2a817c12d6b7bfa784 (diff)
parent1f30faac7363f5e00561c925d2bb4a855db954e2 (diff)
downloadbootstrap-be8d5243f4942a83d9c3e08c5d9f4419536c72c2.tar.xz
bootstrap-be8d5243f4942a83d9c3e08c5d9f4419536c72c2.zip
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2b1ffbfeb..3b10ffb38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ nbproject
.CVS
.idea
node_modules
+dist