summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAlessandro Cosentino <cosenal@gmail.com>2013-03-17 12:31:24 +0100
committerAlessandro Cosentino <cosenal@gmail.com>2013-03-17 12:31:24 +0100
commit36a09666ddfd4710337c43b75884470521883f8a (patch)
tree88fca053b86fc92ee183a5e1384aac5e087de230 /.gitignore
parenta9967c8cac71859eaa634ca843623859a4109c37 (diff)
parente0998ffb6a54fa711e76a7cccc1743f4fa7938f7 (diff)
Merge branch 'master' into news_ext_api
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 6050af0e2..4b3d61818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
coffee/build/
node_modules/
*.log
+build/
+