aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Magnusson2012-11-04 12:52:11 +0100
committerJacob Magnusson2012-11-04 12:52:11 +0100
commitbd5a3ee7d52308fe6c6afc4dcb4b39c061e1c7e6 (patch)
treeac9aa675a70d895cef114e4e83e14481b28d17fd
parent963c5fe4a702f906576ae66e2c4c3193896fcd38 (diff)
parent3e0319389a4e7714e0658bd38cb1e9fb01cf662d (diff)
downloaddjango-rest-framework-bd5a3ee7d52308fe6c6afc4dcb4b39c061e1c7e6.tar.bz2
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework
-rw-r--r--docs/topics/credits.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index df022341..0e8399b3 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -53,6 +53,7 @@ The following people have helped make REST framework great.
* Stephan Groß - [minddust]
* Pavel Savchenko - [asfaltboy]
* Otto Yiu - [ottoyiu]
+* Jacob Magnusson - [jmagnusson]
Many thanks to everyone who's contributed to the project.
@@ -141,3 +142,4 @@ To contact the author directly:
[minddust]: https://github.com/minddust
[asfaltboy]: https://github.com/asfaltboy
[ottoyiu]: https://github.com/OttoYiu
+[jmagnusson]: https://github.com/jmagnusson