diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-14 16:55:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-14 16:55:22 +0200 |
| commit | ea65e5512c236b81e7f4b8757521facadae4b3b8 (patch) | |
| tree | 739cdf40fb6a89de90c4189936d695288a82849f /example_project/urls.py | |
| parent | 4b0f0777c434f5fa1366ca408c34d257d4833fad (diff) | |
| parent | a55f77a246f99764ff6289686f80825526654e2b (diff) | |
| download | Chimère-ea65e5512c236b81e7f4b8757521facadae4b3b8.tar.bz2 Chimère-ea65e5512c236b81e7f4b8757521facadae4b3b8.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/fixtures/initial_data.json
chimere/forms.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/static/chimere/css/styles.css
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/views.py
chimere/widgets.py
Diffstat (limited to 'example_project/urls.py')
| -rw-r--r-- | example_project/urls.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/example_project/urls.py b/example_project/urls.py index a49cb4f..e37ae53 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -28,6 +28,11 @@ 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('', |