Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Audrey Roy 2013-05-18 12:33:31 +02:00
commit 88f51fceb7
2 changed files with 2 additions and 1 deletions

View file

@ -119,6 +119,7 @@ INSTALLED_APPS = (
# 'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'djadmin2',
'blog',
)

View file

@ -6,7 +6,7 @@ from django.conf.urls import patterns, include, url
urlpatterns = patterns('',
# Examples:
# url(r'^$', 'example.views.home', name='home'),
url(r'^$', include('djadmin2.urls')),
# url(r'^example/', include('example.foo.urls')),
# Uncomment the admin/doc line below to enable admin documentation: