diff options
| author | Tom Christie | 2012-09-27 13:34:48 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-09-27 13:34:48 +0100 |
| commit | 4d906938a9304be119a9b15f6540a8cbab6f1154 (patch) | |
| tree | fea0eab18d3013d7ebdc232dd68725dee4c34524 /docs | |
| parent | 284a700e09708355676fb703e57f592352230784 (diff) | |
| parent | 8582b18ac4f7258acd559c3deac21cee9ae7727d (diff) | |
| download | django-rest-framework-4d906938a9304be119a9b15f6540a8cbab6f1154.tar.bz2 | |
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/credits.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 3111254d..b280dba2 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -42,6 +42,7 @@ The following people have helped make REST framework great. * Alec Perkins - [alecperkins] * Michael Barrett - [phobologic] * Mathieu Dhondt - [laundromat] +* Johan Charpentier - [cyberj] Many thanks to everyone who's contributed to the project. @@ -105,4 +106,5 @@ 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 +[laundromat]: https://github.com/laundromat +[cyberj]: https://github.com/cyberj
\ No newline at end of file |