Commit 2aabc2dc by benjaoming

move macros configuration and do not include django_notify twice in the urlconf

parent affa1594
...@@ -101,15 +101,15 @@ INSTALLED_APPS = ( ...@@ -101,15 +101,15 @@ INSTALLED_APPS = (
'django.contrib.admindocs', 'django.contrib.admindocs',
'south', 'south',
'sekizai', 'sekizai',
'django_notify',
'sorl.thumbnail', 'sorl.thumbnail',
'django_notify',
'wiki', 'wiki',
'wiki.plugins.macros',
'wiki.plugins.help', 'wiki.plugins.help',
'wiki.plugins.links', 'wiki.plugins.links',
'wiki.plugins.images', 'wiki.plugins.images',
'wiki.plugins.attachments', 'wiki.plugins.attachments',
'wiki.plugins.notifications', 'wiki.plugins.notifications',
'wiki.plugins.macros',
'mptt', 'mptt',
#'haystack', #'haystack',
) )
......
...@@ -8,7 +8,6 @@ admin.autodiscover() ...@@ -8,7 +8,6 @@ admin.autodiscover()
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^notify/', include('django_notify.urls', namespace='notify')),
) )
if settings.DEBUG: if settings.DEBUG:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment