diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-02-02 21:49:03 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-02 21:49:03 +0100 |
commit | ae4a1dd6dec9d95e450837db8937e3fb7604c121 (patch) | |
tree | 3dacf85a7f3d3f31820bf8afd5c1ad1082dde2aa | |
parent | cc68e6bcb2f79d6a7d7adbe924c9c05a791bd76c (diff) | |
parent | 3bf2a3fb99569236c4cabe838e2dbcc1a26f0c2d (diff) | |
download | mitmproxy-ae4a1dd6dec9d95e450837db8937e3fb7604c121.tar.gz mitmproxy-ae4a1dd6dec9d95e450837db8937e3fb7604c121.tar.bz2 mitmproxy-ae4a1dd6dec9d95e450837db8937e3fb7604c121.zip |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
-rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 390e5e02..ed5a7ad5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,8 +76,8 @@ notifications: on_failure: always slack: rooms: - - mitmproxy:YaDGC9Gt9TEM7o8zkC2OLNsu - on_success: change + - mitmproxy:YaDGC9Gt9TEM7o8zkC2OLNsu#ci + on_success: always on_failure: always # exclude cryptography from cache |