diff options
| author | Andrew Hankinson | 2013-01-01 11:36:23 -0500 |
|---|---|---|
| committer | Andrew Hankinson | 2013-01-01 11:36:23 -0500 |
| commit | 389ca3b3b1faa90ea4624f495115d83024fdc151 (patch) | |
| tree | 24f1877904d2d1e40d62d52562ac9940175d7b5b /rest_framework/serializers.py | |
| parent | c6f212238c238561749574a54aec3b1b1fd8df61 (diff) | |
| parent | eff833b39d2f41c9eb773214f5b45c3d991e1511 (diff) | |
| download | django-rest-framework-389ca3b3b1faa90ea4624f495115d83024fdc151.tar.bz2 | |
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into patch-support
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index e8e6735a..ed173d85 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -14,7 +14,7 @@ from rest_framework.compat import get_concrete_model # This helps keep the seperation between model fields, form fields, and # serializer fields more explicit. - +from rest_framework.relations import * from rest_framework.fields import * |