Mercurial > hgbook
changeset 706:0e33dd5d8288
Automated merge with ssh://ssh.serpentine.com/hg/share/mercurial/book
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue, 31 Mar 2009 08:58:45 -0700 |
| parents | 88b611f37646 (current diff) 1735c9699f92 (diff) |
| children | c17f8bffc9e5 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/web/hgbook/urls.py Fri Mar 27 11:09:37 2009 -0700 +++ b/web/hgbook/urls.py Tue Mar 31 08:58:45 2009 -0700 @@ -1,6 +1,9 @@ import os from django.conf.urls.defaults import * import hgbook.comments.feeds as feeds +from django.contrib import admin + +admin.autodiscover() feeds = { 'comments': feeds.Comments, @@ -18,5 +21,5 @@ # sys.modules[__name__].__file__) + '/../../en/html'), # Uncomment this for admin: - (r'^admin/', include('django.contrib.admin.urls')), + (r'^admin/(.*)', admin.site.root), )