aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics
diff options
context:
space:
mode:
authorTom Christie2012-11-19 13:30:49 -0800
committerTom Christie2012-11-19 13:30:49 -0800
commitb9e5c9484ae34b6675ea940854d58e2561bcc7f9 (patch)
tree8de7b921b7bc8b7cf9275cf07c8f26c3bf276d14 /docs/topics
parent25f024575bc36ea6ed386160a31b70abb5ac3e6e (diff)
parentf5f1ac49ec9d9cb180a00c791f2701c3f5a2d65b (diff)
downloaddjango-rest-framework-b9e5c9484ae34b6675ea940854d58e2561bcc7f9.tar.bz2
Merge pull request #399 from robromano/master
Added login view for users of TokenAuthentication
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/credits.md3
-rw-r--r--docs/topics/release-notes.md2
2 files changed, 5 insertions, 0 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index f037e816..34590109 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -60,6 +60,7 @@ The following people have helped make REST framework great.
* Ben Konrath - [benkonrath]
* Marc Aymerich - [glic3rinu]
* Ludwig Kraatz - [ludwigkraatz]
+* Rob Romano - [robromano]
* Eugene Mechanism - [mechanism]
Many thanks to everyone who's contributed to the project.
@@ -156,4 +157,6 @@ To contact the author directly:
[benkonrath]: https://github.com/benkonrath
[glic3rinu]: https://github.com/glic3rinu
[ludwigkraatz]: https://github.com/ludwigkraatz
+[robromano]: https://github.com/robromano
[mechanism]: https://github.com/mechanism
+
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 2a6fbe83..d43f892f 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -4,6 +4,8 @@
>
> — Eric S. Raymond, [The Cathedral and the Bazaar][cite].
+* Add convenience login view to get tokens when using `TokenAuthentication`
+
## 2.1.3
**Date**: 16th Nov 2012