Code

Use pytest instead of py.test#502

Code

Merged

n2ygk merged 2 commits intodjango-json-api:masterdjango-json-api/django-rest-framework-json-api:masterfrom

sliverc:not_needed_django_settingssliverc/django-rest-framework-json-api:not_needed_django_settingsCopy head branch name to clipboard

Oct 25, 2018

Commits

Commits on Oct 25, 2018

• Use pytest instead of py.test

  Show description for 0ea5f48
  

  Oliver Sauder

  committed
  0ea5f48

  Copy full SHA for 0ea5f48

• Merge branch 'master' into not_needed_django_settings

  sliverc

  authored
  1ea208d

  Copy full SHA for 1ea208d