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 /app/AppKernel.php | |
| 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 'app/AppKernel.php')
| -rw-r--r-- | app/AppKernel.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index 2475fe16..1eacb348 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
| @@ -29,6 +29,7 @@ class AppKernel extends Kernel | |||
| 29 | new FOS\OAuthServerBundle\FOSOAuthServerBundle(), | 29 | new FOS\OAuthServerBundle\FOSOAuthServerBundle(), |
| 30 | new Wallabag\UserBundle\WallabagUserBundle(), | 30 | new Wallabag\UserBundle\WallabagUserBundle(), |
| 31 | new Scheb\TwoFactorBundle\SchebTwoFactorBundle(), | 31 | new Scheb\TwoFactorBundle\SchebTwoFactorBundle(), |
| 32 | new KPhoen\RulerZBundle\KPhoenRulerZBundle(), | ||
| 32 | ); | 33 | ); |
| 33 | 34 | ||
| 34 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { | 35 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { |