aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2012-09-27 13:06:34 +0100
committerTom Christie2012-09-27 13:06:34 +0100
commit89a0b223067cd0bb10d5e309f5fb5d0237a069a7 (patch)
treeaa4f6722c077073c93c0d6c1401b2b9978f25b08
parent91b3fb0b05778edeee48ea2a8cd8c784afa1a744 (diff)
parentda1f6df4faed60aded0c38977de53877c1d67258 (diff)
downloaddjango-rest-framework-89a0b223067cd0bb10d5e309f5fb5d0237a069a7.tar.bz2
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
-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 e54fd4bf..3111254d 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -41,6 +41,7 @@ The following people have helped make REST framework great.
* Shawn Lewis - [shawnlewis]
* Alec Perkins - [alecperkins]
* Michael Barrett - [phobologic]
+* Mathieu Dhondt - [laundromat]
Many thanks to everyone who's contributed to the project.
@@ -104,3 +105,4 @@ To contact the author directly:
[shawnlewis]: https://github.com/shawnlewis
[alecperkins]: https://github.com/alecperkins
[phobologic]: https://github.com/phobologic
+[laundromat]: https://github.com/laundromat \ No newline at end of file