diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-02-07 18:01:15 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-02-07 18:01:15 +0100 |
| commit | 18460b2d79125d0252e7fe71e1ae84d5ef4f040a (patch) | |
| tree | 41a6d649a66c8db1dcb3296ddfb4f35405467961 /composer.json | |
| parent | 2e5b3fa361098498a9e42a65396a27e1eb487fba (diff) | |
| parent | 47e47841105a34c852744e207b4a0ea9e879ec49 (diff) | |
| download | wallabag-18460b2d79125d0252e7fe71e1ae84d5ef4f040a.tar.gz wallabag-18460b2d79125d0252e7fe71e1ae84d5ef4f040a.tar.zst wallabag-18460b2d79125d0252e7fe71e1ae84d5ef4f040a.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/composer.json b/composer.json index 7678d7b8..b28404e3 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | "ext-iconv": "*", | 46 | "ext-iconv": "*", |
| 47 | "ext-tokenizer": "*", | 47 | "ext-tokenizer": "*", |
| 48 | "ext-pdo": "*", | 48 | "ext-pdo": "*", |
| 49 | "ext-tidy": "*", | ||
| 49 | "symfony/symfony": "3.4.*", | 50 | "symfony/symfony": "3.4.*", |
| 50 | "doctrine/orm": "^2.6", | 51 | "doctrine/orm": "^2.6", |
| 51 | "doctrine/doctrine-bundle": "^1.9", | 52 | "doctrine/doctrine-bundle": "^1.9", |