diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-03-06 21:48:33 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-03-06 21:48:33 +0100 |
| commit | f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab (patch) | |
| tree | e6ea5fb4786e843b970b14d5a96da8c32548a315 /app | |
| parent | 73b774438395d0ed74d0fd863194d2ebfb68d9ce (diff) | |
| parent | 6e22bd737b2e543c85487864a9a25b0f2d5cc3f2 (diff) | |
| download | wallabag-f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab.tar.gz wallabag-f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab.tar.zst wallabag-f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab.zip | |
Merge pull request #1110 from wallabag/v2-api-hypermedia
[WIP] API : hypermedia & tags
Diffstat (limited to 'app')
| -rw-r--r-- | app/AppKernel.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index d134de3c..601b52c3 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
| @@ -22,7 +22,8 @@ class AppKernel extends Kernel | |||
| 22 | new Nelmio\ApiDocBundle\NelmioApiDocBundle(), | 22 | new Nelmio\ApiDocBundle\NelmioApiDocBundle(), |
| 23 | new Nelmio\CorsBundle\NelmioCorsBundle(), | 23 | new Nelmio\CorsBundle\NelmioCorsBundle(), |
| 24 | new Liip\ThemeBundle\LiipThemeBundle(), | 24 | new Liip\ThemeBundle\LiipThemeBundle(), |
| 25 | new Wallabag\CoreBundle\WallabagCoreBundle() | 25 | new Wallabag\CoreBundle\WallabagCoreBundle(), |
| 26 | new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle() | ||
| 26 | ); | 27 | ); |
| 27 | 28 | ||
| 28 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { | 29 | if (in_array($this->getEnvironment(), array('dev', 'test'))) { |