diff options
| author | Filippo Valsorda <[email protected]> | 2012-12-11 12:15:16 +0100 |
|---|---|---|
| committer | Filippo Valsorda <[email protected]> | 2012-12-11 12:15:16 +0100 |
| commit | 95eb771dcda47f948b050da85c7ff22539e3ee12 (patch) | |
| tree | 3bea4b6975544ef76241ccf402de541da350b4ac /.travis.yml | |
| parent | 3c6ffbaedbbae8734f6b86fea1169413b656abf3 (diff) | |
| parent | 4fb1acc212555e3e817f858dce964876eef75d85 (diff) | |
| download | youtube-dl-95eb771dcda47f948b050da85c7ff22539e3ee12.tar.gz youtube-dl-95eb771dcda47f948b050da85c7ff22539e3ee12.zip | |
Merge branch 'master' into fork_master
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index c6c758fd5..0aabce6a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - "2.6" - "2.7" # - "3.3" -script: nosetests test --nocapture +script: nosetests test --verbose notifications: email: |