diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-12-06 14:31:26 +0100 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-12-06 14:31:26 +0100 |
commit | a7f1921f7db312b5def3839393357f443dcbb52c (patch) | |
tree | 0522e03891433e9fdc9eb64d52b2d9651aadf1f7 /composer.json | |
parent | 2e15e30bf0e634bbbc3a9678904953d015490ed2 (diff) | |
parent | 752b90d1f2e279d3662d5431b09c7587df2937ca (diff) | |
download | wallabag-a7f1921f7db312b5def3839393357f443dcbb52c.tar.gz wallabag-a7f1921f7db312b5def3839393357f443dcbb52c.tar.zst wallabag-a7f1921f7db312b5def3839393357f443dcbb52c.zip |
Merge pull request #1478 from K-Phoen/rule-based-tags
Rule based tags
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 5892dc1a..26608cdc 100644 --- a/composer.json +++ b/composer.json | |||
@@ -57,7 +57,8 @@ | |||
57 | "friendsofsymfony/oauth-server-bundle": "^1.4@dev", | 57 | "friendsofsymfony/oauth-server-bundle": "^1.4@dev", |
58 | "scheb/two-factor-bundle": "~1.4", | 58 | "scheb/two-factor-bundle": "~1.4", |
59 | "grandt/phpepub": "~4.0", | 59 | "grandt/phpepub": "~4.0", |
60 | "wallabag/php-mobi": "~1.0.0" | 60 | "wallabag/php-mobi": "~1.0.0", |
61 | "kphoen/rulerz-bundle": "~0.10" | ||
61 | }, | 62 | }, |
62 | "require-dev": { | 63 | "require-dev": { |
63 | "doctrine/doctrine-fixtures-bundle": "~2.2.0", | 64 | "doctrine/doctrine-fixtures-bundle": "~2.2.0", |