diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
| commit | b878be4cc99fd4927c70b59386cf7a57b33bb381 (patch) | |
| tree | 9a5186ead93b9f6114b5341a7713f614eb58f6ec /composer.json | |
| parent | e673b54f702f274a087e4feff409663d9636e57b (diff) | |
| parent | bffe65478de71113a16f6e7a7ef75845c9d61180 (diff) | |
| download | wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.gz wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.zst wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
# Conflicts:
# web/wallassets/baggy.js
# web/wallassets/manifest.json
# web/wallassets/material.css
# web/wallassets/material.js
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index f209a5c2..6d5415ab 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -90,7 +90,7 @@ | |||
| 90 | "require-dev": { | 90 | "require-dev": { |
| 91 | "doctrine/doctrine-fixtures-bundle": "~3.0", | 91 | "doctrine/doctrine-fixtures-bundle": "~3.0", |
| 92 | "sensio/generator-bundle": "^3.0", | 92 | "sensio/generator-bundle": "^3.0", |
| 93 | "symfony/phpunit-bridge": "^3.3", | 93 | "symfony/phpunit-bridge": "3.4.x-dev", |
| 94 | "friendsofphp/php-cs-fixer": "~2.0", | 94 | "friendsofphp/php-cs-fixer": "~2.0", |
| 95 | "m6web/redis-mock": "^2.0", | 95 | "m6web/redis-mock": "^2.0", |
| 96 | "dama/doctrine-test-bundle": "^4.0" | 96 | "dama/doctrine-test-bundle": "^4.0" |