Code

Fix regression introduced by #4035#4041

Code

Merged

xordoquy merged 3 commits intoencode:masterencode/django-rest-framework:masterfrom linovia:bug/fix_correct_string_typelinovia/django-rest-framework:bug/fix_correct_string_typeCopy head branch name to clipboardApr 7, 2016

+2-2

Commits

Commits on Apr 5, 2016

• Fix the string_types / text_types confusion introduced in encode#4025

  xordoquy

  committed
  763aab6

Commits on Apr 7, 2016

• Typo correction.

  xordoquy

  committed
  2622588

• Merge remote-tracking branch 'reference/master' into bug/fix_correct_string_type

  xordoquy

  committed
  29a2e54