diff options
| author | José Padilla | 2015-02-01 15:34:33 -0400 |
|---|---|---|
| committer | José Padilla | 2015-02-01 15:34:33 -0400 |
| commit | b844cc4bb6b53e2bac4ce1351b22f44a82b7b937 (patch) | |
| tree | f508468e09d32d1e4a4283ddce7e71a16526afa2 /rest_framework/viewsets.py | |
| parent | 37dce89354ab2c94fefeb0a20b6265fef98caddc (diff) | |
| parent | e63f49bd1d55501f766ca2e3f9c0c9fa3cfa19ab (diff) | |
| download | django-rest-framework-b844cc4bb6b53e2bac4ce1351b22f44a82b7b937.tar.bz2 | |
Merge remote-tracking branch 'upstream/version-3.1' into version-3.1
Conflicts:
rest_framework/serializers.py
Diffstat (limited to 'rest_framework/viewsets.py')
0 files changed, 0 insertions, 0 deletions