[open-ils-commits] r1352 - servres/trunk/conifer (gfawcett)

[svn at svn.open-ils.org]

Author: gfawcett
Date: 2011-04-13 19:44:31 -0400 (Wed, 13 Apr 2011)
New Revision: 1352

Modified:
   servres/trunk/conifer/urls.py
Log:
conifer/urls.py: reverting URL change; this was clobbering the Django admin screen.

Modified: servres/trunk/conifer/urls.py
===================================================================
--- servres/trunk/conifer/urls.py	2011-04-13 20:03:59 UTC (rev 1351)
+++ servres/trunk/conifer/urls.py	2011-04-13 23:44:31 UTC (rev 1352)
@@ -21,7 +21,7 @@
     (r'^djadmin/doc/', include('django.contrib.admindocs.urls')),
 
     # Uncomment the next line to enable the admin:
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^djadmin/', include(admin.site.urls)),
     # old form: (r'^djadmin/(.*)', admin.site.root),
     (r'^djmedia/(.*)', 'django.views.static.serve',
         {'document_root': ADMIN_MEDIA_ROOT}),