diff options
| author | Marko Tibold | 2011-12-30 01:37:32 +0100 |
|---|---|---|
| committer | Marko Tibold | 2011-12-30 01:37:32 +0100 |
| commit | 1b28339e5b733a0422c2bcd06b39e289bc98f69b (patch) | |
| tree | 9e766f4f9d9ec596bc0e2702e1bb291b90aa3a93 /djangorestframework/urls.py | |
| parent | 91cee26ad89c04a70f33ae334150dd127f900474 (diff) | |
| parent | a0c4dca9462c738aac3c712607997b9bd1f7b2c8 (diff) | |
| download | django-rest-framework-1b28339e5b733a0422c2bcd06b39e289bc98f69b.tar.bz2 | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'djangorestframework/urls.py')
| -rw-r--r-- | djangorestframework/urls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/djangorestframework/urls.py b/djangorestframework/urls.py index 271b0215..827aac9c 100644 --- a/djangorestframework/urls.py +++ b/djangorestframework/urls.py @@ -13,4 +13,4 @@ urlpatterns = patterns('djangorestframework.utils.staticviews', if not settings.DEBUG: urlpatterns += patterns('djangorestframework.utils.staticviews', (r'favicon.ico', 'favicon'), - )
\ No newline at end of file + ) |