diff options
| author | Sébastien Piquemal | 2012-02-23 09:01:33 +0200 |
|---|---|---|
| committer | Sébastien Piquemal | 2012-02-23 09:01:33 +0200 |
| commit | 9da1ae81dc9a056db94ea07f35478ed003fea598 (patch) | |
| tree | 2557ce0fe8be2b7febb184c3bb3da7b5289fbbe1 /djangorestframework/urls.py | |
| parent | 242327d339fe1193a45c64cb20a2ba4c56044c3b (diff) | |
| parent | 5fd4c639d7c64572dd07dc31dcd627bed9469b05 (diff) | |
| download | django-rest-framework-9da1ae81dc9a056db94ea07f35478ed003fea598.tar.bz2 | |
merged + fixed broken test
Diffstat (limited to 'djangorestframework/urls.py')
| -rw-r--r-- | djangorestframework/urls.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/djangorestframework/urls.py b/djangorestframework/urls.py index 827aac9c..5c797bcd 100644 --- a/djangorestframework/urls.py +++ b/djangorestframework/urls.py @@ -1,16 +1,6 @@ from django.conf.urls.defaults import patterns -from django.conf import settings urlpatterns = patterns('djangorestframework.utils.staticviews', - (r'robots.txt', 'deny_robots'), (r'^accounts/login/$', 'api_login'), (r'^accounts/logout/$', 'api_logout'), ) - -# Only serve favicon in production because otherwise chrome users will pretty much -# permanantly have the django-rest-framework favicon whenever they navigate to -# 127.0.0.1:8000 or whatever, which gets annoying -if not settings.DEBUG: - urlpatterns += patterns('djangorestframework.utils.staticviews', - (r'favicon.ico', 'favicon'), - ) |