diff options
| author | Jacek Bzdak | 2013-10-22 13:13:01 +0200 |
|---|---|---|
| committer | Jacek Bzdak | 2013-10-22 13:13:01 +0200 |
| commit | 8fffc346c1c4fe6e634ce60bd0371217b07ecf5c (patch) | |
| tree | d9f52a4b886d574039cdcffd72266df49c1b6a8c /docs/topics | |
| parent | 25c9d552c05527f4b8b257d59cd7be39005f3668 (diff) | |
| parent | fa87fac61b87858e80788fc233591fa11dbc18e7 (diff) | |
| download | django-rest-framework-8fffc346c1c4fe6e634ce60bd0371217b07ecf5c.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/credits.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 9a20028c..cd3b3710 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -172,6 +172,8 @@ The following people have helped make REST framework great. * Markus Kaiserswerth - [mkai] * Henry Clifford - [hcliff] * Thomas Badaud - [badale] +* Colin Huang - [tamakisquare] +* Ross McFarland - [ross] Many thanks to everyone who's contributed to the project. @@ -380,3 +382,5 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [mkai]: https://github.com/mkai [hcliff]: https://github.com/hcliff [badale]: https://github.com/badale +[tamakisquare]: https://github.com/tamakisquare +[ross]: https://github.com/ross |