diff options
| author | Robert Romano | 2012-11-18 21:07:44 -0800 |
|---|---|---|
| committer | Robert Romano | 2012-11-18 21:07:44 -0800 |
| commit | f5f1ac49ec9d9cb180a00c791f2701c3f5a2d65b (patch) | |
| tree | 663e254f3125d1281035d471fc4fa38d7ca3ee3d /rest_framework/authtoken/serializers.py | |
| parent | d541e0c42326443b613df764cbe26a68b852b71d (diff) | |
| parent | d1472740bc5f08871343d1a63e409e34d05504cb (diff) | |
| download | django-rest-framework-f5f1ac49ec9d9cb180a00c791f2701c3f5a2d65b.tar.bz2 | |
Update robromano fork with upstream master
Conflicts:
docs/topics/credits.md
docs/topics/release-notes.md
Diffstat (limited to 'rest_framework/authtoken/serializers.py')
0 files changed, 0 insertions, 0 deletions