diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
| commit | 0faeabefa7faedb3a6a3675a5e49e947554adae9 (patch) | |
| tree | e51ae7db64408b159b2dfa13bfa9e01530223dc9 /composer.json | |
| parent | 2bb138ef6df2d1a608b42907185b274fb87f4513 (diff) | |
| parent | 317fc6e684356b645ea1327c2631c7d5fc193ddd (diff) | |
| download | wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.gz wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.zst wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
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 7beb9bd9..38ccec81 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -73,7 +73,7 @@ | |||
| 73 | "grandt/phpepub": "~4.0", | 73 | "grandt/phpepub": "~4.0", |
| 74 | "wallabag/php-mobi": "~1.0.0", | 74 | "wallabag/php-mobi": "~1.0.0", |
| 75 | "kphoen/rulerz-bundle": "~0.10", | 75 | "kphoen/rulerz-bundle": "~0.10", |
| 76 | "guzzlehttp/guzzle": "^5.2.0", | 76 | "guzzlehttp/guzzle": "^5.3.1", |
| 77 | "doctrine/doctrine-migrations-bundle": "^1.0", | 77 | "doctrine/doctrine-migrations-bundle": "^1.0", |
| 78 | "paragonie/random_compat": "~1.0", | 78 | "paragonie/random_compat": "~1.0", |
| 79 | "craue/config-bundle": "~1.4", | 79 | "craue/config-bundle": "~1.4", |