diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
| commit | 64a8781e453c40ff144d03405abe2dc1ccfacbe0 (patch) | |
| tree | 311473a357e3dedd496e1417293eed9a2a116ad6 /src/Wallabag/CoreBundle/DependencyInjection/Configuration.php | |
| parent | 9313ea9d440e3f93a6bb2d8c0fb6717364cd27f5 (diff) | |
| parent | c64b4941d5222586a82d2c8d6a61969bb9cfe96b (diff) | |
| download | wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.gz wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.zst wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'src/Wallabag/CoreBundle/DependencyInjection/Configuration.php')
| -rw-r--r-- | src/Wallabag/CoreBundle/DependencyInjection/Configuration.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php index d8141eea..3a3da024 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php | |||
| @@ -39,6 +39,8 @@ class Configuration implements ConfigurationInterface | |||
| 39 | ->integerNode('cache_lifetime') | 39 | ->integerNode('cache_lifetime') |
| 40 | ->defaultValue(10) | 40 | ->defaultValue(10) |
| 41 | ->end() | 41 | ->end() |
| 42 | ->scalarNode('fetching_error_message') | ||
| 43 | ->end() | ||
| 42 | ->end() | 44 | ->end() |
| 43 | ; | 45 | ; |
| 44 | 46 | ||