diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2017-02-24 16:23:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-24 16:23:06 +0100 |
| commit | 85b4b6e0cd8c52603e814b86ebf8be3b08671729 (patch) | |
| tree | 1c24abeec46818c1313c750d451aaf6e651993e5 | |
| parent | 227a009da594465c2d415059cf318de08df55461 (diff) | |
| parent | 5a73f9459031270c4c764dd2f4d9ea418b31bc8d (diff) | |
| download | wallabag-85b4b6e0cd8c52603e814b86ebf8be3b08671729.tar.gz wallabag-85b4b6e0cd8c52603e814b86ebf8be3b08671729.tar.zst wallabag-85b4b6e0cd8c52603e814b86ebf8be3b08671729.zip | |
Merge pull request #2931 from wallabag/php-7.1
Use wallabag/tcpdf
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | composer.json | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 8c8093bf..29ca7dc3 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.1 | ||
| 48 | - php: nightly | 47 | - php: nightly |
| 49 | 48 | ||
| 50 | # exclude v1 branches | 49 | # exclude v1 branches |
diff --git a/composer.json b/composer.json index b919f446..c43d2dcf 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -58,7 +58,7 @@ | |||
| 58 | "jms/serializer-bundle": "~1.1", | 58 | "jms/serializer-bundle": "~1.1", |
| 59 | "nelmio/api-doc-bundle": "~2.7", | 59 | "nelmio/api-doc-bundle": "~2.7", |
| 60 | "mgargano/simplehtmldom": "~1.5", | 60 | "mgargano/simplehtmldom": "~1.5", |
| 61 | "tecnickcom/tc-lib-pdf": "dev-master", | 61 | "wallabag/tcpdf": "^6.2", |
| 62 | "simplepie/simplepie": "~1.3.1", | 62 | "simplepie/simplepie": "~1.3.1", |
| 63 | "willdurand/hateoas-bundle": "~1.0", | 63 | "willdurand/hateoas-bundle": "~1.0", |
| 64 | "htmlawed/htmlawed": "~1.1.19", | 64 | "htmlawed/htmlawed": "~1.1.19", |