diff options
| author | Le Jeune Yann <lj.yann@gmail.com> | 2011-01-09 01:39:27 +0100 |
|---|---|---|
| committer | Le Jeune Yann <lj.yann@gmail.com> | 2011-01-09 01:39:27 +0100 |
| commit | 2906e1e6b8fab767be4fddb28814f83b31fc783e (patch) | |
| tree | b6cec68237b9ed994fd07d5285e624fe24c03129 /.gitignore | |
| parent | bd9a7b9981e0cdd787a6ec774c55bc875fbadb64 (diff) | |
| parent | 09ab8db48f245271991b1bdce281033de7275c80 (diff) | |
| download | Ishtar-2906e1e6b8fab767be4fddb28814f83b31fc783e.tar.bz2 Ishtar-2906e1e6b8fab767be4fddb28814f83b31fc783e.zip | |
Merge branch 'master' of ssh://lysithea.proxience.com/home/proxience/git/ishtar
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 92606cf09..d79b2cf6f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,6 @@ *.pyc *.mo django-simple-history/* -django-merlin/* -communesdefrancedetaillees.csv -projet_données_d_échange_2010.zip +django-formwizard/* ishtar-docs ishtar-logo |