aboutsummaryrefslogtreecommitdiff
path: root/codemash
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2012-12-28 15:43:50 -0500
committerMike Crute <mcrute@gmail.com>2012-12-28 16:49:00 -0500
commitdea70a8855cebe6d35eb8508ee150a79e87b8f45 (patch)
tree3b4d257afa155a341ba4df643718ab56dbe9a411 /codemash
parent58bb872b14658fac9ad719f46bb4b1f80c966fc1 (diff)
downloaddjango-precompiler-dea70a8855cebe6d35eb8508ee150a79e87b8f45.tar.bz2
django-precompiler-dea70a8855cebe6d35eb8508ee150a79e87b8f45.tar.xz
django-precompiler-dea70a8855cebe6d35eb8508ee150a79e87b8f45.zip
Users can submit talk proposals
Diffstat (limited to 'codemash')
-rw-r--r--codemash/settings.py1
-rw-r--r--codemash/urls.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/codemash/settings.py b/codemash/settings.py
index fbd61f8..efdfb99 100644
--- a/codemash/settings.py
+++ b/codemash/settings.py
@@ -129,6 +129,7 @@ INSTALLED_APPS = (
129 129
130 'contact', 130 'contact',
131 'accounts', 131 'accounts',
132 'proposals',
132) 133)
133 134
134# A sample logging configuration. The only tangible logging 135# A sample logging configuration. The only tangible logging
diff --git a/codemash/urls.py b/codemash/urls.py
index 762679a..da6f216 100644
--- a/codemash/urls.py
+++ b/codemash/urls.py
@@ -9,6 +9,7 @@ urlpatterns = patterns('',
9 (r'^contact/', include('contact.urls', namespace='contact')), 9 (r'^contact/', include('contact.urls', namespace='contact')),
10 (r'^accounts/', include('django.contrib.auth.urls', namespace='auth')), 10 (r'^accounts/', include('django.contrib.auth.urls', namespace='auth')),
11 (r'^accounts/', include('accounts.urls', namespace='account')), 11 (r'^accounts/', include('accounts.urls', namespace='account')),
12 (r'^proposals/', include('proposals.urls', namespace='proposals')),
12 13
13 url(r'^admin/doc/', include('django.contrib.admindocs.urls')), 14 url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
14 url(r'^admin/', include(admin.site.urls)), 15 url(r'^admin/', include(admin.site.urls)),