diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-01-15 09:41:18 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-01-15 09:41:18 +0100 |
| commit | 5419a8368ebb4b4d57f481b842f1fcc576c9149d (patch) | |
| tree | cd970bb8f3ec5e6487fc1e3bd2de1f89455d3d90 /composer.json | |
| parent | 5c331bf0f9ef679aaf91ef29b13120272fcccbf5 (diff) | |
| parent | f6b9e883c01196d5aec249f6e8e02e07d0da4089 (diff) | |
| download | wallabag-5419a8368ebb4b4d57f481b842f1fcc576c9149d.tar.gz wallabag-5419a8368ebb4b4d57f481b842f1fcc576c9149d.tar.zst wallabag-5419a8368ebb4b4d57f481b842f1fcc576c9149d.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/composer.json b/composer.json index 405b1188..8b28f065 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -82,14 +82,14 @@ | |||
| 82 | "javibravo/simpleue": "^2.0", | 82 | "javibravo/simpleue": "^2.0", |
| 83 | "symfony/dom-crawler": "^3.4", | 83 | "symfony/dom-crawler": "^3.4", |
| 84 | "friendsofsymfony/jsrouting-bundle": "^2.2", | 84 | "friendsofsymfony/jsrouting-bundle": "^2.2", |
| 85 | "bdunogier/guzzle-site-authenticator": "^1.0.0@dev", | 85 | "bdunogier/guzzle-site-authenticator": "^1.0.0", |
| 86 | "defuse/php-encryption": "^2.1", | 86 | "defuse/php-encryption": "^2.1", |
| 87 | "html2text/html2text": "^4.1" | 87 | "html2text/html2text": "^4.1" |
| 88 | }, | 88 | }, |
| 89 | "require-dev": { | 89 | "require-dev": { |
| 90 | "doctrine/doctrine-fixtures-bundle": "~3.0", | 90 | "doctrine/doctrine-fixtures-bundle": "~3.0", |
| 91 | "sensio/generator-bundle": "^3.0", | 91 | "sensio/generator-bundle": "^3.0", |
| 92 | "symfony/phpunit-bridge": "^3.4", | 92 | "symfony/phpunit-bridge": "^4.2", |
| 93 | "friendsofphp/php-cs-fixer": "~2.13", | 93 | "friendsofphp/php-cs-fixer": "~2.13", |
| 94 | "m6web/redis-mock": "^4.1", | 94 | "m6web/redis-mock": "^4.1", |
| 95 | "dama/doctrine-test-bundle": "^5.0" | 95 | "dama/doctrine-test-bundle": "^5.0" |