diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
| commit | 16dabc326311f084d671be188c7941bbb3c341c9 (patch) | |
| tree | 3210a7688ea2bfa1bff5fd0422b52adf570edcdc /app/AppKernel.php | |
| parent | fdef5f460524215d806e244e5546865f4b8e01df (diff) | |
| parent | 8263e71192989dc0fd28a41ac22f9c5b32eb11c4 (diff) | |
| download | wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.gz wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.zst wallabag-16dabc326311f084d671be188c7941bbb3c341c9.zip | |
Merge pull request #1436 from wallabag/v2-register
Public registration & oAuth2 \o/
Diffstat (limited to 'app/AppKernel.php')
| -rw-r--r-- | app/AppKernel.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index 08e14b8f..6315fcde 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
| @@ -26,6 +26,8 @@ class AppKernel extends Kernel | |||
| 26 | new Wallabag\ApiBundle\WallabagApiBundle(), | 26 | new Wallabag\ApiBundle\WallabagApiBundle(), |
| 27 | new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(), | 27 | new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(), |
| 28 | new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(), | 28 | new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(), |
| 29 | new FOS\OAuthServerBundle\FOSOAuthServerBundle(), | ||
| 30 | new Wallabag\UserBundle\WallabagUserBundle(), | ||
| 29 | ); | 31 | ); |
| 30 | 32 | ||
| 31 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { | 33 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { |