summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--project_static/.project_static0
-rw-r--r--settings.py1
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 0562840..9b310ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,7 @@
*.mo
*.ignore
static
-media
local_settings.py
+media/*
+static/*
+*.pyc
diff --git a/project_static/.project_static b/project_static/.project_static
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/project_static/.project_static
diff --git a/settings.py b/settings.py
index a07de9e..0d7009c 100644
--- a/settings.py
+++ b/settings.py
@@ -140,7 +140,6 @@ CHIMERE_CSV_ENCODING = 'ISO-8859-1'
CHIMERE_DEFAULT_ACTIONS = ['view', 'contribute']
CHIMERE_DEFAULT_ACTION_LABEL = [u"Cartes", u"Ajouter un element"]
-
# generic contact email
CONTACT_EMAIL = ''