Skip to content

Commit

Permalink
Merge branch 'master-fix'
Browse files Browse the repository at this point in the history
  • Loading branch information
ashwoods committed Aug 20, 2017
2 parents f1de102 + e0ca737 commit dce2cd3
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Expand Up @@ -41,13 +41,14 @@ matrix:
- python: "3.5"
env: TOXENV=py35-django-111-fix
- python: "3.5"
env: TOXENV=py35-django-dev DEV=True
env: TOXENV=py35-django-dev

- python: "3.6"
env: TOXENV=py36-django-dev DEV=True
env: TOXENV=py36-django-dev

allow_failures:
- env: DEV=True
- env: TOXENV=py35-django-dev
- env: TOXENV=py36-django-dev

install: pip install tox tox-travis coveralls wheel
script: tox
Expand Down

0 comments on commit dce2cd3

Please sign in to comment.