| Age | Commit message (Collapse) | Author |
|
Conflicts:
.travis.yml
docs/api-guide/routers.md
rest_framework/compat.py
tox.ini
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
.travis.yml
docs/api-guide/routers.md
docs/topics/release-notes.md
rest_framework/compat.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Simple typo fix.
|
|
|
|
|
|
|
|
|
|
For work on #1109.
|
|
|
|
attributes prefered. Closes #1100
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|