diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-28 16:15:27 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-28 16:15:27 +0200 |
| commit | cdd3010b478c9ca818dd6d22d03c81ef4a5ab208 (patch) | |
| tree | ffc9957fc228625501214bbb2e9f4bebe7936982 /.travis.yml | |
| parent | 13d44ca766b1020327f0b9b005dc2e95deb156a1 (diff) | |
| parent | 985f5f9d05f7ff7e443442b1775923b379c141d6 (diff) | |
| download | wallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.tar.gz wallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.tar.zst wallabag-cdd3010b478c9ca818dd6d22d03c81ef4a5ab208.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 65e7e304..c343d5ae 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -62,6 +62,7 @@ matrix: | |||
| 62 | env: DB=sqlite ASSETS=build | 62 | env: DB=sqlite ASSETS=build |
| 63 | allow_failures: | 63 | allow_failures: |
| 64 | - php: hhvm-3.12 | 64 | - php: hhvm-3.12 |
| 65 | - php: 7.1 | ||
| 65 | - php: nightly | 66 | - php: nightly |
| 66 | 67 | ||
| 67 | # exclude v1 branches | 68 | # exclude v1 branches |