@@ -25,13 +25,13 @@ handler404 = 'modpythoncustom.view404'
admin.autodiscover()
urlpatterns = patterns('',
(r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/(.*)', admin.site.urls),
(r'^feeds/blog/?$', 'django.contrib.syndication.views.Feed', BlogFeed()),
(r'^feeds/news/?$', 'django.contrib.syndication.views.Feed', PressReleaseFeed()),
(r'^feeds/omnibus/?$', 'django.contrib.syndication.views.Feed', OmnibusFeed()),
(r'^feeds/blog/?$', BlogFeed()),
(r'^feeds/news/?$', PressReleaseFeed()),
(r'^feeds/omnibus/?$', OmnibusFeed()),
(r'^feeds/?$', 'conservancy.feeds.view'),
(r'^news(/|$)', include('conservancy.apps.news.urls')),
(r'^blog(/|$)', include('conservancy.apps.blog.urls')),
)