fnp
/
turniej.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Django 2.2
[turniej.git]
/
turniej
/
urls.py
diff --git
a/turniej/urls.py
b/turniej/urls.py
index
56baf14
..
eafb8c9
100644
(file)
--- a/
turniej/urls.py
+++ b/
turniej/urls.py
@@
-1,10
+1,8
@@
-from django.conf.urls import patterns, include, url
-from edition2.urls import urlpatterns as e2_urlpatterns
+from django.conf.urls import include, url
-# from django.contrib import admin
-# admin.autodiscover()
-urlpatterns =
patterns('',
+urlpatterns =
[
url(r'^2011/', include('edition1.urls')),
url(r'^poezja/', include('poetry.urls')),
url(r'^2011/', include('edition1.urls')),
url(r'^poezja/', include('poetry.urls')),
-) + e2_urlpatterns
+ url(r'', include('edition2.urls')),
+]