summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ebe020a67..92606cf09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
*.pyc
*.mo
django-simple-history/*
+django-merlin/*
communesdefrancedetaillees.csv
projet_données_d_échange_2010.zip
ishtar-docs