devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-15 08:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2931 from wallabag/php-7.1

Browse Source 
Use wallabag/tcpdf
This commit is contained in:
Jeremy Benoist 2017-02-24 16:23:06 +01:00 committed by GitHub
commit 85b4b6e0cd
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -44,7 +44,6 @@ matrix:
- php: 7.0 - php: 7.0
env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
allow_failures: allow_failures:
- php: 7.1
- php: nightly - php: nightly
# exclude v1 branches # exclude v1 branches

2
composer.json
View File

@ -58,7 +58,7 @@
"jms/serializer-bundle": "~1.1", "jms/serializer-bundle": "~1.1",
"nelmio/api-doc-bundle": "~2.7", "nelmio/api-doc-bundle": "~2.7",
"mgargano/simplehtmldom": "~1.5", "mgargano/simplehtmldom": "~1.5",
"tecnickcom/tc-lib-pdf": "dev-master", "wallabag/tcpdf": "^6.2",
"simplepie/simplepie": "~1.3.1", "simplepie/simplepie": "~1.3.1",
"willdurand/hateoas-bundle": "~1.0", "willdurand/hateoas-bundle": "~1.0",
"htmlawed/htmlawed": "~1.1.19", "htmlawed/htmlawed": "~1.1.19",