diff options
| author | Xavier Ordoquy | 2014-04-30 22:21:26 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-04-30 22:21:26 +0200 |
| commit | 56b43903162c5f3d64fb32945b87168887d283cc (patch) | |
| tree | 3c58eeb2d76cd689ae2e584f4149720876c938a2 /docs/api-guide/viewsets.md | |
| parent | d08536ad9d026fb7126c430f6d9c18f8540aacd6 (diff) | |
| parent | d8fb81ceb15afe09a50584afcc466de812d30046 (diff) | |
| download | django-rest-framework-56b43903162c5f3d64fb32945b87168887d283cc.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into 2.4.0
Conflicts:
.travis.yml
rest_framework/serializers.py
rest_framework/tests/test_authentication.py
Diffstat (limited to 'docs/api-guide/viewsets.md')
0 files changed, 0 insertions, 0 deletions