Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into choices_for_ModelSerializer.get_field

This commit is contained in:
Marko Tibold 2012-10-22 21:40:52 +02:00
commit ba735e6d27

View File

@ -88,7 +88,7 @@ or `django.db.models.fields.TextField`.
## ChoiceField
A field that can accept on of a limited set of choices.
A field that can accept a value out of a limited set of choices.
## EmailField