Code

Rebased PR#253 open by adaptivdesign#265

Code

Merged

jerel merged 5 commits intodjango-json-api:developdjango-json-api/django-rest-framework-json-api:developfrom

knaperek:developknaperek/django-rest-framework-json-api:developCopy head branch name to clipboard

Aug 9, 2016

Commits

Commits on Jun 2, 2016

• initial fix for regular serializer relations

  

  Raymond Reggers

  committed
  127f4b7

  Copy full SHA for 127f4b7

• fixes to resolve correct resource_name

  

  Raymond Reggers

  committed
  10c2633

  Copy full SHA for 10c2633

• prioritize serializer resource_name

  

  Raymond Reggers

  committed
  735d67a

  Copy full SHA for 735d67a

Commits on Jun 3, 2016

• minor fix to included serializers

  

  Raymond Reggers

  committed
  54d0de8

  Copy full SHA for 54d0de8

Commits on Aug 3, 2016

• Merge remote-tracking branch 'upstream/develop' into develop

  Show description for d3bf13a
  knaperek

  committed
  d3bf13a

  Copy full SHA for d3bf13a