django-rest-framework, branch 2.0.0 Web APIs for Django. Merge branch 'restframework2' into rest-framework-2-merge 2012-10-30T14:32:31+00:00 Tom Christie 2012-10-30T14:32:31+00:00 9b30dab4f772f67a626e176dc4fae0a3ef9c2c81 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 
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
Make docs ready to push to django-rest-framework.org 2012-10-30T14:18:23+00:00 Tom Christie 2012-10-30T14:18:16+00:00 4e7805cb24d73e7f706318b5e5a27e3f9ba39d14 






Merge pull request #341 from minddust/restframework2
2012-10-30T14:06:53+00:00

Tom Christie

2012-10-30T14:06:53+00:00

a13aaea78debc63fce9c134a9a1ee2a0e3d3236c

fix ModelSerializer useage




fix ModelSerializer useage






Final docs tweaks for 2.0
2012-10-30T13:59:31+00:00

Tom Christie

2012-10-30T13:59:31+00:00

4cdd0b845e10c433358f210c84a2b3fe28543c68












added missing word + removed double whitespace
2012-10-30T13:53:38+00:00

Stephan Groß

2012-10-30T13:53:38+00:00

3216ac022419710485695a9a21f083f08e012a7f












added missing word
2012-10-30T13:38:23+00:00

Stephan Groß

2012-10-30T13:38:23+00:00

aa081678d5fecf6a17b411545571348e047c6846












fixed typo
2012-10-30T13:36:37+00:00

Stephan Groß

2012-10-30T13:36:37+00:00

a967187b4102af88dec4d8a2b9ffd97b6c65db0b












fixed typo
2012-10-30T13:11:36+00:00

Stephan Groß

2012-10-30T13:11:36+00:00

abf7f1161933567e622c51af9a53e4b860c11693












removed empty row
2012-10-30T13:02:12+00:00

Stephan Groß

2012-10-30T13:02:12+00:00

bcfb46eedc8fd7184e73a1fa6cecb1a359d1ef1f












fix ModelSerializer useage
2012-10-30T12:50:07+00:00

Stephan Groß

2012-10-30T12:50:07+00:00

9aa37260098b5ec2750090fb035945780b35ad1d

cause of:
from snippets.models import Snippet





cause of:
from snippets.models import Snippet