diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-22 23:03:16 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-22 23:03:16 +0200 |
| commit | 79efca1e6ff28362d4bd2713f68205294cdd07de (patch) | |
| tree | c20482071f97b5ba0f075d59a9a097b08b26b910 /src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php | |
| parent | 9c545fe028013b30417c1a932cd6b9027bff752d (diff) | |
| parent | 80bb0b73445092c4aa3e94f90cc5f8667fa123ba (diff) | |
| download | wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.gz wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.zst wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php')
| -rw-r--r-- | src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php index 84599f0d..7d08b73b 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php | |||
| @@ -25,6 +25,7 @@ class WallabagCoreExtension extends Extension | |||
| 25 | 25 | ||
| 26 | $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); | 26 | $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |
| 27 | $loader->load('services.yml'); | 27 | $loader->load('services.yml'); |
| 28 | $loader->load('parameters.yml'); | ||
| 28 | } | 29 | } |
| 29 | 30 | ||
| 30 | public function getAlias() | 31 | public function getAlias() |