diff options
| author | Tom Christie | 2012-10-08 12:18:43 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-10-08 12:18:43 +0100 |
| commit | 4fd8ab17a3e935d72bb4ec25ed8f16a21ec2c0ef (patch) | |
| tree | d95e030c43b47d61826ed16f28af1379a9a60c0b /docs/topics | |
| parent | f4d4d54e030addf64efe68f387b934262a3c173b (diff) | |
| parent | 321d4d030a80b67b0f2e12171beb00b717c02804 (diff) | |
| download | django-rest-framework-4fd8ab17a3e935d72bb4ec25ed8f16a21ec2c0ef.tar.bz2 | |
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/credits.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 8ff05e05..539fa09e 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -44,6 +44,8 @@ The following people have helped make REST framework great. * Mathieu Dhondt - [laundromat] * Johan Charpentier - [cyberj] * Jamie Matthews - [j4mie] +* Mattbo - [mattbo] +* Max Hurl - [maximilianhurl] Many thanks to everyone who's contributed to the project. @@ -118,4 +120,6 @@ To contact the author directly: [phobologic]: https://github.com/phobologic [laundromat]: https://github.com/laundromat [cyberj]: https://github.com/cyberj -[j4mie]: https://github.com/j4mie
\ No newline at end of file +[j4mie]: https://github.com/j4mie +[mattbo]: https://github.com/mattbo +[maximilianhurl]: https://github.com/maximilianhurl
\ No newline at end of file |