diff options
| author | Tom Christie | 2012-02-21 20:57:36 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-02-21 20:57:36 +0000 |
| commit | 5fd4c639d7c64572dd07dc31dcd627bed9469b05 (patch) | |
| tree | d7cf3ba46e76937176f81e1ebc334bc790e7026c /djangorestframework/resources.py | |
| parent | af9e4f69d732cc643d6ec7ae13d4a19ac0332d44 (diff) | |
| download | django-rest-framework-5fd4c639d7c64572dd07dc31dcd627bed9469b05.tar.bz2 | |
Merge master into develop
Diffstat (limited to 'djangorestframework/resources.py')
| -rw-r--r-- | djangorestframework/resources.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/djangorestframework/resources.py b/djangorestframework/resources.py index eadc11d0..8ee49f82 100644 --- a/djangorestframework/resources.py +++ b/djangorestframework/resources.py @@ -3,6 +3,7 @@ from django.core.urlresolvers import get_urlconf, get_resolver, NoReverseMatch from django.db import models from djangorestframework.response import ImmediateResponse +from djangorestframework.reverse import reverse from djangorestframework.serializer import Serializer, _SkipField from djangorestframework.utils import as_tuple, reverse |