diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-18 08:32:47 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-18 08:32:47 +0200 |
| commit | aa0bd601ea3db281187275bbbece760d85ff29d9 (patch) | |
| tree | c84bebb3966255cdae36562024592c6b4eb6a2f2 /.travis.yml | |
| parent | 80624be7c54aec6ed98ee254366155024fca1a71 (diff) | |
| parent | 6074bc9ba4ecdd08674a828bdb46323b5d8bf957 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
debian/changelog
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 b413134c5..2852db483 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,5 @@ language: cpp before_install: - sudo apt-get update -q - sudo ./prepare-release travis-ci - - sudo apt-get install -q --no-install-recommends stunnel4 + - sudo apt-get install -q --no-install-recommends stunnel4 db-util script: make && make test && test/integration/run-tests |