diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-12-29 20:32:58 +0100 |
---|---|---|
committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-12-29 20:32:58 +0100 |
commit | e6a228c43bf98f64d2d046314bae224c5b87399e (patch) | |
tree | 950c2c0533d4425b6572cfa9de84c40c44956b12 /.travis.yml | |
parent | c997cfcc9c161241a6398b0942a1a869688d807a (diff) | |
parent | ab64c3d9ac591d30447428bd357b5b8c3a9bbcd7 (diff) | |
download | wallabag-e6a228c43bf98f64d2d046314bae224c5b87399e.tar.gz wallabag-e6a228c43bf98f64d2d046314bae224c5b87399e.tar.zst wallabag-e6a228c43bf98f64d2d046314bae224c5b87399e.zip |
Merge pull request #1544 from wallabag/2fa-email
v2 – Add custom email for 2FA
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 4542fdcb..7a7c9056 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -32,7 +32,6 @@ matrix: | |||
32 | - php: hhvm | 32 | - php: hhvm |
33 | env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency | 33 | env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency |
34 | allow_failures: | 34 | allow_failures: |
35 | - php: 7.0 | ||
36 | - php: hhvm | 35 | - php: hhvm |
37 | 36 | ||
38 | branches: | 37 | branches: |