diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
| commit | 39643c6b76d92d509b1af0228b6379d7fdce8a1c (patch) | |
| tree | 931dceef7dbc8ae9911d01ded709d558417a6cdd /composer.json | |
| parent | 488a468e3e11ff0ab6284afe232bf0f7fa68a8eb (diff) | |
| parent | b88cf91fc8371194df78e690983c61ea94f266cd (diff) | |
| download | wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.gz wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.zst wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.zip | |
Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1
v2 – 1st draft for Pocket import via API & Wallabag v1 import
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json index bf519faf..0ba42a3e 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -59,7 +59,8 @@ | |||
| 59 | "scheb/two-factor-bundle": "~1.4.0", | 59 | "scheb/two-factor-bundle": "~1.4.0", |
| 60 | "grandt/phpepub": "~4.0", | 60 | "grandt/phpepub": "~4.0", |
| 61 | "wallabag/php-mobi": "~1.0.0", | 61 | "wallabag/php-mobi": "~1.0.0", |
| 62 | "kphoen/rulerz-bundle": "~0.10" | 62 | "kphoen/rulerz-bundle": "~0.10", |
| 63 | "guzzlehttp/guzzle": "^5.2.0" | ||
| 63 | }, | 64 | }, |
| 64 | "require-dev": { | 65 | "require-dev": { |
| 65 | "doctrine/doctrine-fixtures-bundle": "~2.2.0", | 66 | "doctrine/doctrine-fixtures-bundle": "~2.2.0", |