summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2010-12-29 10:58:46 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2010-12-29 10:58:46 +0100
commitf1eca7a1eef6a2ff8bb87c4626001c231eb4c8fd (patch)
tree7856604c8fa5601a1b29adc0f1161501c33e0c7e /.gitignore
parent537b4b443b5e9232a90b506c804c52ea0ed396ba (diff)
downloadIshtar-f1eca7a1eef6a2ff8bb87c4626001c231eb4c8fd.tar.bz2
Ishtar-f1eca7a1eef6a2ff8bb87c4626001c231eb4c8fd.zip
Integration of session wizard (refs #51)
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