From f1eca7a1eef6a2ff8bb87c4626001c231eb4c8fd Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Wed, 29 Dec 2010 10:58:46 +0100
Subject: Integration of session wizard (refs #51)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

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
-- 
cgit v1.2.3