summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-07-01 10:32:24 -0400
committerTim Graham <timograham@gmail.com>2015-07-01 10:32:24 -0400
commit2baf6826c9e730e56363e2f812e521835d35a872 (patch)
tree5052fdb1960f142c028e8c155840eec4e59395a1
parent9bd3a2325e22bdc034ec2646afc412a1d3f16a71 (diff)
downloaddjango-2baf6826c9e730e56363e2f812e521835d35a872.tar.gz
[1.7.x] Backported .gitignore and .hgignore from master.
-rw-r--r--.gitignore2
-rw-r--r--.hgignore6
2 files changed, 8 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5f1338f232..504361b225 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ MANIFEST
dist/
docs/_build/
docs/locale/
+node_modules/
tests/coverage_html/
tests/.coverage
build/
+tests/report/
diff --git a/.hgignore b/.hgignore
index fc6cc0d138..8c900d573a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,6 +4,12 @@ syntax:glob
*.pot
*.py[co]
__pycache__
+MANIFEST
+dist/
docs/_build/
+docs/locale/
+node_modules/
tests/coverage_html/
tests/.coverage
+build/
+tests/report/