aboutsummaryrefslogtreecommitdiff
path: root/codemash/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'codemash/urls.py')
-rw-r--r--codemash/urls.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/codemash/urls.py b/codemash/urls.py
index 567499c..68896ca 100644
--- a/codemash/urls.py
+++ b/codemash/urls.py
@@ -1,19 +1,18 @@
1from django.conf.urls import patterns, include, url 1from django.conf.urls import patterns, include, url
2from django.contrib import admin
3
4
5admin.autodiscover()
2 6
3# Uncomment the next two lines to enable the admin:
4# from django.contrib import admin
5# admin.autodiscover()
6 7
7urlpatterns = patterns('', 8urlpatterns = patterns('',
8 (r'^contact/', include('contact.urls', namespace='contact')), 9 (r'^contact/', include('contact.urls', namespace='contact')),
9 (r'^accounts/', include('django.contrib.auth.urls', namespace='auth')), 10 (r'^accounts/', include('django.contrib.auth.urls', namespace='auth')),
10 (r'^accounts/', include('accounts.urls', namespace='account')), 11 (r'^accounts/', include('accounts.urls', namespace='account')),
11 12
12 url(r'^$', 'pages.views.home', name='home'), 13 url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
14 url(r'^admin/', include(admin.site.urls)),
13 15
14 # Uncomment the admin/doc line below to enable admin documentation: 16 url(r'^$', 'pages.views.home', name='home'),
15 # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
16 17
17 # Uncomment the next line to enable the admin:
18 # url(r'^admin/', include(admin.site.urls)),
19) 18)