Skip to content
Merged
Changes from 1 commit
Commits
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
Merge branch 'master' into no-1.8-10
  • Loading branch information
mblayman committed Dec 3, 2017
commit ab71b7f56d8c2043e0b90d7bb61bb684447c6a75
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ def get_package_data(package):
'inflection>=0.3.0',
'djangorestframework>=3.6.3',
'django>=1.11',
'six',
],
setup_requires=pytest_runner + sphinx + wheel,
tests_require=[
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.