fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'infographics'
[edumed.git]
/
contact
/
urls.py
diff --git
a/contact/urls.py
b/contact/urls.py
index
de72e82
..
7f8d4c4
100644
(file)
--- a/
contact/urls.py
+++ b/
contact/urls.py
@@
-1,4
+1,4
@@
-from django.conf.urls
.defaults import *
+from django.conf.urls
import patterns, url
from . import views
urlpatterns = patterns('contact.views',