diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-07-22 21:46:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-22 21:46:56 -0700 |
| commit | 88195ae2cf26f36ad5f568af17b528dee5591413 (patch) | |
| tree | 2f0914475ce01cddc732fbe1eb784899c83dea5b /.travis.yml | |
| parent | e85566e4ee5834e04e191763c787389cb53f3296 (diff) | |
| download | mitmproxy-88195ae2cf26f36ad5f568af17b528dee5591413.tar.gz mitmproxy-88195ae2cf26f36ad5f568af17b528dee5591413.tar.bz2 mitmproxy-88195ae2cf26f36ad5f568af17b528dee5591413.zip | |
re-enable OSX builds on travis (#1411)
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 |