Merge branch 'master' into saclay

Conflicts:
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/static/chimere/css/styles.css
	chimere/static/chimere/js/jquery.chimere.js
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/utils.py
	chimere/views.py
	example_project/settings.py

1 files changed, 0 insertions, 44 deletions

diff --git a/example_project/urls.py b/example_project/urls.py
deleted file mode 100644
index e37ae53..0000000
--- a/example_project/urls.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2012 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# See the file COPYING for details.
-
-from django.conf import settings
-from django.conf.urls.defaults import *
-
-from django.contrib import admin
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-
-admin.autodiscover()
-urlpatterns = patterns('django.views.static',
-    (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve',
-     {'document_root': settings.MEDIA_ROOT}),
-)
-
-if "tinymce" in settings.INSTALLED_APPS:
-    urlpatterns += patterns('django.views.static',
-        (r'^tinymce/', include('tinymce.urls')),)
-
-urlpatterns += staticfiles_urlpatterns()
-
-urlpatterns += patterns('',
-    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    (r'^admin/', include(admin.site.urls)),
-    url(r'^', include('chimere.urls', namespace="chimere")),
-)
-
-