diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-25 15:16:16 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-25 15:16:16 -0700 |
| commit | 79ebcb046e8669f80357a6c3046ec76c6adf49be (patch) | |
| tree | 441981a16f1be1e620584e4a47f41767ce5585b2 /.travis.yml | |
| parent | 3254595584e1d711e7ae292ad34753a52f7a0fc1 (diff) | |
| parent | 56796aeda25dda66621ce78af227ff46049ef811 (diff) | |
| download | mitmproxy-79ebcb046e8669f80357a6c3046ec76c6adf49be.tar.gz mitmproxy-79ebcb046e8669f80357a6c3046ec76c6adf49be.tar.bz2 mitmproxy-79ebcb046e8669f80357a6c3046ec76c6adf49be.zip | |
Merge remote-tracking branch 'origin/master' into flow_editing_v2
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index e832d058..e9566ebe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,10 @@ matrix: include: - python: 3.5 env: TOXENV=lint -# - os: osx -# osx_image: xcode7.3 -# language: generic -# env: TOXENV=py35 + - os: osx + osx_image: xcode7.3 + language: generic + env: TOXENV=py35 - python: 3.5 env: TOXENV=py35 - python: 3.5 |