Skip to content

Merge upstream #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrickXu merged 7 commits into from
Nov 25, 2014
Merged

Merge upstream #1

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
790a651
Fixed database update instructions
LuRsT Nov 24, 2014
918b9cc
Added missing import in tutorial snippet
LuRsT Nov 24, 2014
eb77de4
Merge pull request #2117 from LuRsT/patch-6
xordoquy Nov 24, 2014
3371131
Merge pull request #2116 from LuRsT/patch-5
lovelydinosaur Nov 24, 2014
bdacb66
Lowercase HTML label tag. Refs #2121.
lovelydinosaur Nov 25, 2014
735d225
Merge branch 'master' of https://github.com/tomchristie/django-rest-f…
lovelydinosaur Nov 25, 2014
ecc26f6
Style tweaks to login template.
lovelydinosaur Nov 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added missing import in tutorial snippet
  • Loading branch information
@LuRsT
LuRsT committed Nov 24, 2014
commit 918b9cc6a605ee4701d77f73e93a62f04c2345b0
2 changes: 1 addition & 1 deletion docs/tutorial/6-viewsets-and-routers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ To see what's going on under the hood let's first explicitly create a set of vie

In the `urls.py` file we bind our `ViewSet` classes into a set of concrete views.

from snippets.views import SnippetViewSet, UserViewSet
from snippets.views import SnippetViewSet, UserViewSet, api_root
from rest_framework import renderers

snippet_list = SnippetViewSet.as_view({
Expand Down