diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
| commit | 39643c6b76d92d509b1af0228b6379d7fdce8a1c (patch) | |
| tree | 931dceef7dbc8ae9911d01ded709d558417a6cdd /app/AppKernel.php | |
| parent | 488a468e3e11ff0ab6284afe232bf0f7fa68a8eb (diff) | |
| parent | b88cf91fc8371194df78e690983c61ea94f266cd (diff) | |
| download | wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.gz wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.zst wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.zip | |
Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1
v2 – 1st draft for Pocket import via API & Wallabag v1 import
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 85edc14a..93b0201a 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
| @@ -31,6 +31,7 @@ class AppKernel extends Kernel | |||
| 31 | new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(), | 31 | new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(), |
| 32 | new Scheb\TwoFactorBundle\SchebTwoFactorBundle(), | 32 | new Scheb\TwoFactorBundle\SchebTwoFactorBundle(), |
| 33 | new KPhoen\RulerZBundle\KPhoenRulerZBundle(), | 33 | new KPhoen\RulerZBundle\KPhoenRulerZBundle(), |
| 34 | new Wallabag\ImportBundle\WallabagImportBundle(), | ||
| 34 | ); | 35 | ); |
| 35 | 36 | ||
| 36 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { | 37 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { |