diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-07 13:46:30 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-07 13:46:30 +0200 |
| commit | 7083c0a21d27e7e1bf45a9807a76844116d61fb8 (patch) | |
| tree | b72b5a0516d9114aeeccd6ecdb055ee240bda66a /.travis.yml | |
| parent | 44043ebe82a22470e2514d05efac324035ee809a (diff) | |
| parent | 495f83c92539444bff7dfd6cd647b7d65a74f949 (diff) | |
| download | wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.tar.gz wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.tar.zst wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
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 c6c03dc3..eb409533 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -44,7 +44,6 @@ matrix: | |||
| 44 | - php: 7.0 | 44 | - php: 7.0 |
| 45 | env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite | 45 | env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite |
| 46 | allow_failures: | 46 | allow_failures: |
| 47 | - php: 7.2 | ||
| 48 | - php: nightly | 47 | - php: nightly |
| 49 | 48 | ||
| 50 | # exclude v1 branches | 49 | # exclude v1 branches |