diff options
| author | Pablo Recio | 2013-05-18 12:51:40 +0200 |
|---|---|---|
| committer | Pablo Recio | 2013-05-18 12:51:40 +0200 |
| commit | 53a80044016c2ea0f4551735b0f974d1571d52ee (patch) | |
| tree | b79711fc0854ea614f8a51c850fda870e4d07630 /setup.py | |
| parent | ab8bd566f9db327a4c463317011818d421bbf89c (diff) | |
| parent | 2a3056d03844a31373f1e30aec58e70616115838 (diff) | |
| download | django-rest-framework-53a80044016c2ea0f4551735b0f974d1571d52ee.tar.bz2 | |
Merge branch 'master' into 725-blank-choice-dash
Conflicts:
rest_framework/tests/fields.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions