diff options
| author | Tom Christie | 2013-05-14 11:40:43 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-05-14 11:40:43 +0100 |
| commit | d199a89c184988883be6e78163512aa1d1643e51 (patch) | |
| tree | 4e30feeaf7860669cc6b08c7f8ef323aaa347279 | |
| parent | 6487fa535b6399920a4a6bc2aba306a8cae8c81c (diff) | |
| parent | 1154d873e956e89b1b994c3ac803d90cbfcedf59 (diff) | |
| download | django-rest-framework-d199a89c184988883be6e78163512aa1d1643e51.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
| -rw-r--r-- | docs/topics/credits.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 63132604..097dec7f 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -135,7 +135,7 @@ Continuous integration testing is managed with [Travis CI][travis-ci]. The [live sandbox][sandbox] is hosted on [Heroku]. -Various inspiration taken from the [Rails], [Piston], [Tastypie] and [Dagny] projects. +Various inspiration taken from the [Rails], [Piston], [Tastypie], [Dagny] and [django-viewsets] projects. Development of REST framework 2.0 was sponsored by [DabApps]. @@ -154,6 +154,7 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [piston]: https://bitbucket.org/jespern/django-piston [tastypie]: https://github.com/toastdriven/django-tastypie [dagny]: https://github.com/zacharyvoase/dagny +[django-viewsets]: https://github.com/BertrandBordage/django-viewsets [dabapps]: http://lab.dabapps.com [sandbox]: http://restframework.herokuapp.com/ [heroku]: http://www.heroku.com/ @@ -278,4 +279,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [eyepulp]: https://github.com/eyepulp [dhepper]: https://github.com/dhepper [hamishcampbell]: https://github.com/hamishcampbell -[avinash240]: https://github.com/avinash240
\ No newline at end of file +[avinash240]: https://github.com/avinash240 |