diff options
| author | Rob Romano | 2012-11-14 13:01:43 -0800 |
|---|---|---|
| committer | Rob Romano | 2012-11-14 13:01:43 -0800 |
| commit | d541e0c42326443b613df764cbe26a68b852b71d (patch) | |
| tree | 2aabab3c459e204c47ac02e863af5a1413f4faae /docs | |
| parent | 535b65a34862e1dcf6370046a37e9cd0e980f491 (diff) | |
| parent | 8ebbae683bcdb1b70711df8e0cfaad760c4e8fd0 (diff) | |
| download | django-rest-framework-d541e0c42326443b613df764cbe26a68b852b71d.tar.bz2 | |
Merge branch 'master' of https://github.com/robromano/django-rest-framework
Conflicts:
docs/api-guide/authentication.md
docs/topics/credits.md
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/credits.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 939dfc57..0669d88a 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -157,4 +157,3 @@ To contact the author directly: [glic3rinu]: https://github.com/glic3rinu [ludwigkraatz]: https://github.com/ludwigkraatz [robromano]: https://github.com/robromano - |