diff options
| author | Xavier Ordoquy | 2014-07-26 00:06:56 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-07-26 00:06:56 +0200 |
| commit | 4876bec9f529cac69aede8e51746d8a0fd6b0d88 (patch) | |
| tree | 80290706f8c3d5b1c89a763545123cf13709953c /rest_framework/settings.py | |
| parent | 2489e38a06f575aa144644eee683bd87f20186ef (diff) | |
| parent | 299a8347e8ef448eefc611eebfe80d7e142ceaa1 (diff) | |
| download | django-rest-framework-4876bec9f529cac69aede8e51746d8a0fd6b0d88.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into 2.4.0
Conflicts:
rest_framework/fields.py
Diffstat (limited to 'rest_framework/settings.py')
0 files changed, 0 insertions, 0 deletions