diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-03-25 16:52:00 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-03-25 16:52:00 +0100 |
| commit | e3c65fd09d849225f2173a310cbbce39c08fd71b (patch) | |
| tree | 50e8df03a421c54a8aee47cdf1caea303e13c0c5 /papillon/urls.py | |
| parent | 3431005b5268d5166d8693bd9e58c8dafaf5be3c (diff) | |
| parent | dbf0a5632319733d8fbdbdff2fb85f5026a02c7a (diff) | |
| download | Papillon-e3c65fd09d849225f2173a310cbbce39c08fd71b.tar.bz2 Papillon-e3c65fd09d849225f2173a310cbbce39c08fd71b.zip | |
Merge branch 'django-1.5' of https://github.com/Trim/papillon into v0.5
Diffstat (limited to 'papillon/urls.py')
| -rw-r--r-- | papillon/urls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/papillon/urls.py b/papillon/urls.py index e184854..25a62c2 100644 --- a/papillon/urls.py +++ b/papillon/urls.py @@ -19,7 +19,7 @@ import settings -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url, include from django.contrib import admin admin.autodiscover() |