diff options
| author | Tom Christie | 2012-10-30 14:32:31 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-10-30 14:32:31 +0000 |
| commit | 9b30dab4f772f67a626e176dc4fae0a3ef9c2c81 (patch) | |
| tree | ca138abf4792f58ffa28684f784f201ee1eef6d7 /AUTHORS | |
| parent | 7e5b1501b5cede61a9391fb1a751d2ebcdb37031 (diff) | |
| parent | 4e7805cb24d73e7f706318b5e5a27e3f9ba39d14 (diff) | |
| download | django-rest-framework-2.0.0.tar.bz2 | |
Merge branch 'restframework2' into rest-framework-2-merge2.0.0
Conflicts:
.gitignore
.travis.yml
AUTHORS
README.rst
djangorestframework/mixins.py
djangorestframework/renderers.py
djangorestframework/resources.py
djangorestframework/serializer.py
djangorestframework/templates/djangorestframework/base.html
djangorestframework/templates/djangorestframework/login.html
djangorestframework/templatetags/add_query_param.py
djangorestframework/tests/accept.py
djangorestframework/tests/authentication.py
djangorestframework/tests/content.py
djangorestframework/tests/reverse.py
djangorestframework/tests/serializer.py
djangorestframework/views.py
docs/examples.rst
docs/examples/blogpost.rst
docs/examples/modelviews.rst
docs/examples/objectstore.rst
docs/examples/permissions.rst
docs/examples/pygments.rst
docs/examples/views.rst
docs/howto/alternativeframeworks.rst
docs/howto/mixin.rst
docs/howto/reverse.rst
docs/howto/usingurllib2.rst
docs/index.rst
docs/topics/release-notes.md
examples/sandbox/views.py
rest_framework/__init__.py
rest_framework/compat.py
rest_framework/utils/breadcrumbs.py
setup.py
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e0840961..00000000 --- a/AUTHORS +++ /dev/null @@ -1,48 +0,0 @@ -Tom Christie <tomchristie> - tom@tomchristie.com, @_tomchristie -Marko Tibold <markotibold> (Additional thanks for providing & managing the Jenkins CI Server) -Paul Bagwell <pbgwl> -Sébastien Piquemal <sebpiq> -Carmen Wick <cwick> -Alex Ehlke <aehlke> -Alen Mujezinovic <flashingpumpkin> -Carles Barrobés <txels> -Michael Fötsch <mfoetsch> -David Larlet <david> -Andrew Straw <astraw> -Zeth <zeth> -Fernando Zunino <fzunino> -Jens Alm <ulmus> -Craig Blaszczyk <jakul> -Garcia Solero <garciasolero> -Tom Drummond <devioustree> -Danilo Bargen <gwrtheyrn> -Andrew McCloud <amccloud> -Thomas Steinacher <thomasst> -Meurig Freeman <meurig> -Anthony Nemitz <anemitz> -Ewoud Kohl van Wijngaarden <ekohl> -Michael Ding <yandy> -Mjumbe Poe <mjumbewu> -Natim <natim> -Sebastian Żurek <sebzur> -Benoit C <dzen> -Chris Pickett <bunchesofdonald> -Ben Timby <btimby> -Michele Lazzeri <michelelazzeri-nextage> -Camille Harang <mammique> -Paul Oswald <poswald> -Sean C. Farley <scfarley> -Daniel Izquierdo <izquierdo> -Can Yavuz <tschan> -Shawn Lewis <shawnlewis> -Adam Ness <greylurk> -<yetist> -Max Arnold <max-arnold> -Ralph Broenink <ralphje> -Simon Pantzare <pilt> -Michael Barrett <phobologic> - -THANKS TO: - -Jesper Noehr <jespern> & the django-piston contributors for providing the starting point for this project. -And of course, to the Django core team and the Django community at large. You guys rock. |