diff options
| author | Robert Romano | 2012-11-18 21:07:44 -0800 |
|---|---|---|
| committer | Robert Romano | 2012-11-18 21:07:44 -0800 |
| commit | f5f1ac49ec9d9cb180a00c791f2701c3f5a2d65b (patch) | |
| tree | 663e254f3125d1281035d471fc4fa38d7ca3ee3d /docs/topics/credits.md | |
| parent | d541e0c42326443b613df764cbe26a68b852b71d (diff) | |
| parent | d1472740bc5f08871343d1a63e409e34d05504cb (diff) | |
| download | django-rest-framework-f5f1ac49ec9d9cb180a00c791f2701c3f5a2d65b.tar.bz2 | |
Update robromano fork with upstream master
Conflicts:
docs/topics/credits.md
docs/topics/release-notes.md
Diffstat (limited to 'docs/topics/credits.md')
| -rw-r--r-- | docs/topics/credits.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 0669d88a..34590109 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -61,6 +61,7 @@ The following people have helped make REST framework great. * Marc Aymerich - [glic3rinu] * Ludwig Kraatz - [ludwigkraatz] * Rob Romano - [robromano] +* Eugene Mechanism - [mechanism] Many thanks to everyone who's contributed to the project. @@ -157,3 +158,5 @@ To contact the author directly: [glic3rinu]: https://github.com/glic3rinu [ludwigkraatz]: https://github.com/ludwigkraatz [robromano]: https://github.com/robromano +[mechanism]: https://github.com/mechanism + |