| Age | Commit message (Collapse) | Author |
|
git://github.com/gregmuellegger/django-rest-framework into gregmuellegger-fixes/2013
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
requirements-test.txt
rest_framework/compat.py
tests/settings.py
tox.ini
|
|
|
|
Ensure _resolve_model does not return None
|
|
Bugfix for #1850
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
into oauth_as_package
Conflicts:
.travis.yml
|
|
Closes #2021.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|