aboutsummaryrefslogtreecommitdiffstats
path: root/docs/topics/credits.md
diff options
context:
space:
mode:
authorTom Christie2013-10-21 09:30:17 +0100
committerTom Christie2013-10-21 09:30:17 +0100
commitc37bd40d2869892a08722b479a8c56f87332f6fd (patch)
treeeb0278d41bf9dc0b9617ae94b417f7b50bb7c77f /docs/topics/credits.md
parent70b0798118c8c02903421bca03e0406fe65d737f (diff)
parent2bea76471007f571db0463df2b2de18e9929b12f (diff)
downloaddjango-rest-framework-c37bd40d2869892a08722b479a8c56f87332f6fd.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs/topics/credits.md')
-rw-r--r--docs/topics/credits.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md
index 586bb0f0..e9c45965 100644
--- a/docs/topics/credits.md
+++ b/docs/topics/credits.md
@@ -171,6 +171,8 @@ The following people have helped make REST framework great.
* Tai Lee - [mrmachine]
* Markus Kaiserswerth - [mkai]
* Henry Clifford - [hcliff]
+* Thomas Badaud - [badale]
+* Colin Huang - [tamakisquare]
Many thanks to everyone who's contributed to the project.
@@ -378,3 +380,5 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
[mrmachine]: https://github.com/mrmachine
[mkai]: https://github.com/mkai
[hcliff]: https://github.com/hcliff
+[badale]: https://github.com/badale
+[tamakisquare]: https://github.com/tamakisquare