~netlandish/django-wiki

2aabc2dc45c16c8d095c099b46a8e80dfd0e6a41 — benjaoming 11 years ago affa159
move macros configuration and do not include django_notify twice in the urlconf
2 files changed, 2 insertions(+), 3 deletions(-)

M testproject/testproject/settings.py
M testproject/testproject/urls.py
M testproject/testproject/settings.py => testproject/testproject/settings.py +2 -2
@@ 101,15 101,15 @@ INSTALLED_APPS = (
    'django.contrib.admindocs',
    'south',
    'sekizai',
    'django_notify',
    'sorl.thumbnail',
    'django_notify',
    'wiki',
    'wiki.plugins.macros',
    'wiki.plugins.help',
    'wiki.plugins.links',
    'wiki.plugins.images',
    'wiki.plugins.attachments',
    'wiki.plugins.notifications',
    'wiki.plugins.macros',
    'mptt',
    #'haystack',
)

M testproject/testproject/urls.py => testproject/testproject/urls.py +0 -1
@@ 8,7 8,6 @@ admin.autodiscover()
urlpatterns = patterns('',
    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
    url(r'^admin/', include(admin.site.urls)),
    url(r'^notify/', include('django_notify.urls', namespace='notify')),
)

if settings.DEBUG: