hgbook

changeset 607:0e33dd5d8288

Automated merge with ssh://ssh.serpentine.com/hg/share/mercurial/book
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 31 08:58:45 2009 -0700 (2009-03-31)
parents 88b611f37646 1735c9699f92
children c17f8bffc9e5
files
line diff
     1.1 --- a/web/hgbook/urls.py	Fri Mar 27 11:09:37 2009 -0700
     1.2 +++ b/web/hgbook/urls.py	Tue Mar 31 08:58:45 2009 -0700
     1.3 @@ -1,6 +1,9 @@
     1.4  import os
     1.5  from django.conf.urls.defaults import *
     1.6  import hgbook.comments.feeds as feeds
     1.7 +from django.contrib import admin
     1.8 +
     1.9 +admin.autodiscover()
    1.10  
    1.11  feeds = {
    1.12      'comments': feeds.Comments,
    1.13 @@ -18,5 +21,5 @@
    1.14      #    sys.modules[__name__].__file__) + '/../../en/html'),
    1.15  
    1.16      # Uncomment this for admin:
    1.17 -    (r'^admin/', include('django.contrib.admin.urls')),
    1.18 +    (r'^admin/(.*)', admin.site.root),
    1.19  )