summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorjules <jules@okfoc.us>2014-02-02 18:58:46 -0500
committerjules <jules@okfoc.us>2014-02-02 18:58:46 -0500
commitb125e3106727e0acb627f17f4de0a1c3a1cf6f49 (patch)
tree36a2be85ac7ee402cd78fe9d53e4dc7da8d9c023 /.gitignore
parentc1e6c0c182102e5d61a8ac26b403b42c5fd40591 (diff)
parent2c0ddba2dab715a7c81a106edcfdd9f5be0592a2 (diff)
Merge branch 'master' into pepper
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 1787d3b..259fb84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ v1
.sass-cache/
.#*
*.swp
+node_modules/
+dist