Merge trunk and fix error.

366c663d · Kevin McDermott · cf027c81 · 691ecea9 · 366c663d
Commit 366c663d authored Mar 10, 2012 by Kevin McDermott
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

example_consumer/urls.py
+1 -1

No files found.
--- a/example_consumer/urls.py
+++ b/example_consumer/urls.py
@@ -41,5 +41,5 @@ urlpatterns = patterns('',
    (r'^logout/$', 'django.contrib.auth.views.logout'),
    (r'^private/$', views.require_authentication),

-    (r'^admin/(.*)', admin.site.root),
+    (r'^admin/', include(admin.site.urls)),
 )