diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-19 11:25:19 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-19 11:25:19 +0200 |
| commit | 4ab0d25f652bdfe184046be6d50afd594709e1a9 (patch) | |
| tree | 0a9ea39836619df4b97d4b12bb6a0384e8c2a5ee /composer.json | |
| parent | 21f78f4d4baae7afaa5845317a9cb52e031f1d1a (diff) | |
| parent | f87e6547e8c49a2fe4bd21ec185e99464d4d957e (diff) | |
| download | wallabag-4ab0d25f652bdfe184046be6d50afd594709e1a9.tar.gz wallabag-4ab0d25f652bdfe184046be6d50afd594709e1a9.tar.zst wallabag-4ab0d25f652bdfe184046be6d50afd594709e1a9.zip | |
Merge remote-tracking branch 'origin/master' into 2.3
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 02a79853..1c58516e 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -84,7 +84,7 @@ | |||
| 84 | "javibravo/simpleue": "^1.0", | 84 | "javibravo/simpleue": "^1.0", |
| 85 | "symfony/dom-crawler": "^3.1", | 85 | "symfony/dom-crawler": "^3.1", |
| 86 | "friendsofsymfony/jsrouting-bundle": "^1.6", | 86 | "friendsofsymfony/jsrouting-bundle": "^1.6", |
| 87 | "bdunogier/guzzle-site-authenticator": "dev-master" | 87 | "bdunogier/guzzle-site-authenticator": "1.0.0-beta1" |
| 88 | }, | 88 | }, |
| 89 | "require-dev": { | 89 | "require-dev": { |
| 90 | "doctrine/doctrine-fixtures-bundle": "~2.2", | 90 | "doctrine/doctrine-fixtures-bundle": "~2.2", |