Merge branch 'master' into 122-new_version_with_related

stix2.0
Greg Back 2018-02-21 11:05:50 -06:00
commit 0ae44bc66e
1 changed files with 3 additions and 0 deletions

View File

@ -9,6 +9,9 @@ python:
- "3.6"
- "3.6-dev"
- "nightly"
matrix:
allow_failures:
- python: "nightly"
install:
- pip install -U pip setuptools
- pip install tox-travis pre-commit