Merge pull request #1478 from K-Phoen/rule-based-tags

Rule based tags
2015-12-06 14:31:26 +01:00
parent 2e15e30bf0 752b90d1f2
commit a7f1921f7d
26 changed files with 1888 additions and 34 deletions
--- a/composer.json
+++ b/composer.json
@ -57,7 +57,8 @@
        "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
        "scheb/two-factor-bundle": "~1.4",
        "grandt/phpepub": "~4.0",
-        "wallabag/php-mobi": "~1.0.0"
+        "wallabag/php-mobi": "~1.0.0",
+        "kphoen/rulerz-bundle": "~0.10"
    },
    "require-dev": {
        "doctrine/doctrine-fixtures-bundle": "~2.2.0",