diff options
author | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
---|---|---|
committer | Paulino Michelazzo <paulino@michelazzo.com.br> | 2016-10-18 22:48:23 +0200 |
commit | 99731f0bb1f6fd2815eeb9af504ce86df927657b (patch) | |
tree | b080efc608d2bbd52b77a4a0067402007f50c5a8 /app/AppKernel.php | |
parent | 3a3c6b866b52721431bed22426d9abfcd0d2dfe0 (diff) | |
parent | 7180aaed45dce62e40620a9e4b202526ebd6a3bb (diff) | |
download | wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.gz wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.tar.zst wallabag-99731f0bb1f6fd2815eeb9af504ce86df927657b.zip |
Merge remote-tracking branch 'wallabag/master'
Diffstat (limited to 'app/AppKernel.php')
-rw-r--r-- | app/AppKernel.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index 04f86eb7..52f85558 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
@@ -13,7 +13,6 @@ class AppKernel extends Kernel | |||
13 | new Symfony\Bundle\TwigBundle\TwigBundle(), | 13 | new Symfony\Bundle\TwigBundle\TwigBundle(), |
14 | new Symfony\Bundle\MonologBundle\MonologBundle(), | 14 | new Symfony\Bundle\MonologBundle\MonologBundle(), |
15 | new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), | 15 | new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), |
16 | new Symfony\Bundle\AsseticBundle\AsseticBundle(), | ||
17 | new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), | 16 | new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), |
18 | new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), | 17 | new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), |
19 | new FOS\RestBundle\FOSRestBundle(), | 18 | new FOS\RestBundle\FOSRestBundle(), |
@@ -39,6 +38,7 @@ class AppKernel extends Kernel | |||
39 | new Wallabag\UserBundle\WallabagUserBundle(), | 38 | new Wallabag\UserBundle\WallabagUserBundle(), |
40 | new Wallabag\ImportBundle\WallabagImportBundle(), | 39 | new Wallabag\ImportBundle\WallabagImportBundle(), |
41 | new Wallabag\AnnotationBundle\WallabagAnnotationBundle(), | 40 | new Wallabag\AnnotationBundle\WallabagAnnotationBundle(), |
41 | new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(), | ||
42 | ]; | 42 | ]; |
43 | 43 | ||
44 | if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { | 44 | if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { |