Commits

Carl Meyer committed 112396e

Cleanup duplication of markitup and adminfiles urls.

Comments (0)

Files changed (1)

 from django.conf.urls.defaults import *
 from django.conf import settings
 
-urlpatterns = patterns(
-     "",
-     url(r"^markitup/", include("markitup.urls")),
-     url(r"^adminfiles/", include("adminfiles.urls")),
-)
+urlpatterns = patterns("")
 
 if settings.DEBUG:
+    from django.contrib import admin
+
+    admin.autodiscover()
+
     urlpatterns += patterns(
         "",
-        url(r"^admin/", include("admin_urls")),
+        url(r"^markitup/", include("markitup.urls")),
+        url(r"^adminfiles/", include("adminfiles.urls")),
+        url(r"^admin/", include(admin.site.urls)),
         )
 
 urlpatterns += patterns(