diff options
| author | Tom Christie | 2013-09-26 16:09:31 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-09-26 16:09:31 +0100 |
| commit | 1fd83adb9c1f888ed05d5b6d570b5e37996f96ba (patch) | |
| tree | 35fef6873d7c643aea1deb7cc903b179662eed4d /docs/topics | |
| parent | 75d6446c8799763dccde0f5f03fbcae39c18dc7f (diff) | |
| parent | 57a51f790bdff6c1cf34f3c6d64b0bef3033d89e (diff) | |
| download | django-rest-framework-1fd83adb9c1f888ed05d5b6d570b5e37996f96ba.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/credits.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 4483f170..b5dce504 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -169,6 +169,7 @@ The following people have helped make REST framework great. * Edmond Wong - [edmondwong] * Ben Reilly - [bwreilly] * Tai Lee - [mrmachine] +* Markus Kaiserswerth - [mkai] Many thanks to everyone who's contributed to the project. @@ -374,3 +375,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [edmondwong]: https://github.com/edmondwong [bwreilly]: https://github.com/bwreilly [mrmachine]: https://github.com/mrmachine +[mkai]: https://github.com/mkai |