diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-03-06 21:48:33 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-03-06 21:48:33 +0100 |
| commit | f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab (patch) | |
| tree | e6ea5fb4786e843b970b14d5a96da8c32548a315 /composer.json | |
| parent | 73b774438395d0ed74d0fd863194d2ebfb68d9ce (diff) | |
| parent | 6e22bd737b2e543c85487864a9a25b0f2d5cc3f2 (diff) | |
| download | wallabag-f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab.tar.gz wallabag-f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab.tar.zst wallabag-f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab.zip | |
Merge pull request #1110 from wallabag/v2-api-hypermedia
[WIP] API : hypermedia & tags
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 0b162c02..590e2629 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -74,6 +74,7 @@ | |||
| 74 | "robmorgan/phinx": "~0.4", | 74 | "robmorgan/phinx": "~0.4", |
| 75 | "tecnick.com/tcpdf": "~6.2", | 75 | "tecnick.com/tcpdf": "~6.2", |
| 76 | "simplepie/simplepie": "~1.3.1", | 76 | "simplepie/simplepie": "~1.3.1", |
| 77 | "willdurand/hateoas-bundle": "1.0.*@dev", | ||
| 77 | "htmlawed/htmlawed": "dev-master", | 78 | "htmlawed/htmlawed": "dev-master", |
| 78 | "liip/theme-bundle": "1.1.3", | 79 | "liip/theme-bundle": "1.1.3", |
| 79 | "wallabag/PHP-Flash-Messages": "dev-master", | 80 | "wallabag/PHP-Flash-Messages": "dev-master", |
| @@ -82,7 +83,8 @@ | |||
| 82 | "wallabag/PHPePub": "dev-master", | 83 | "wallabag/PHPePub": "dev-master", |
| 83 | "wallabag/php-readability": "dev-master", | 84 | "wallabag/php-readability": "dev-master", |
| 84 | "wallabag/phpMobi": "dev-master", | 85 | "wallabag/phpMobi": "dev-master", |
| 85 | "wallabag/Fivefilters_Libraries": "dev-master" | 86 | "wallabag/Fivefilters_Libraries": "dev-master", |
| 87 | "pagerfanta/pagerfanta": "~1.0@dev" | ||
| 86 | }, | 88 | }, |
| 87 | "require-dev": { | 89 | "require-dev": { |
| 88 | "doctrine/doctrine-fixtures-bundle": "dev-master", | 90 | "doctrine/doctrine-fixtures-bundle": "dev-master", |