Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/mattdeboard/Yuk
Browse files Browse the repository at this point in the history
  • Loading branch information
mattdeboard committed Apr 23, 2011
2 parents 3eb2b79 + fda3165 commit 114fd47
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
1 change: 0 additions & 1 deletion settings.py
Expand Up @@ -93,7 +93,6 @@
'south',
'haystack',
'django_extensions',
'django.contrib.sitemaps',
)

ACCOUNT_ACTIVATION_DAYS = 7
Expand Down
2 changes: 0 additions & 2 deletions urls.py
Expand Up @@ -11,8 +11,6 @@
urlpatterns = patterns('',
#(r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/', include(admin.site.urls)),
(r'^sitemap\.xml$', 'django.contrib.sitemaps.views.sitemap',
{'sitemaps': sitemaps})
(r'^search/', 'yuk.views.search_results'),
(r'^add_bookmark_remote/$', 'yuk.views.remote_new_url'),
(r'^add_bookmark/$', 'yuk.views.new_url'),
Expand Down

0 comments on commit 114fd47

Please sign in to comment.