File diff c88641d47c6b → d2c666ed4134
www/conservancy/urls.py
Show inline comments
...
 
@@ -7,7 +7,7 @@ urlpatterns = patterns('',
 
    (r'^$', 'conservancy.frontpage.view'),
 
    (r'^feeds/(?P<url>.*)/?$', 'django.contrib.syndication.views.feed',
 
     {'feed_dict': feed_dict}),
 
    (r'^feeds/$', 'conservancy.feeds.view'),
 
    (r'^news/', include('conservancy.apps.news.urls')),
 
    (r'^blog/', include('conservancy.apps.blog.urls')),
 
    (r'^feeds/?$', 'conservancy.feeds.view'),
 
    (r'^news(/|$)', include('conservancy.apps.news.urls')),
 
    (r'^blog(/|$)', include('conservancy.apps.blog.urls')),
 
)