Minor changes to URLs.

This commit is contained in:
Bradley M. Kuhn 2010-10-11 16:29:20 -04:00
parent c88641d47c
commit d2c666ed41

View file

@ -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')),
)