Code

Merge upstream#1

Code

Merged

BrickXu merged 7 commits intoBrickXu:masterBrickXu/django-rest-framework:masterfrom encode:masterencode/django-rest-framework:masterCopy head branch name to clipboardNov 25, 2014

+9-6

Commits

Commits on Nov 24, 2014

• Fixed database update instructions

  LuRsT

  committed
  790a651

  Copy full SHA for 790a651

• Added missing import in tutorial snippet

  LuRsT

  committed
  918b9cc

  Copy full SHA for 918b9cc

• Merge pull request #2117 from LuRsT/patch-6

  Show description for eb77de4
  xordoquy

  committed
  eb77de4

  Copy full SHA for eb77de4

• Merge pull request #2116 from LuRsT/patch-5

  Show description for 3371131
  tomchristie

  committed
  3371131

  Copy full SHA for 3371131

Commits on Nov 25, 2014

• Lowercase HTML label tag. Refs #2121.

  tomchristie

  committed
  bdacb66

  Copy full SHA for bdacb66

• Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

  tomchristie

  committed
  735d225

  Copy full SHA for 735d225

• Style tweaks to login template.

  tomchristie

  committed
  ecc26f6

  Copy full SHA for ecc26f6