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/Resources/config/services.yml | |
| 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/Resources/config/services.yml')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 048a72fc..cc5f9e9a 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
| @@ -40,7 +40,7 @@ services: | |||
| 40 | class: Graby\Graby | 40 | class: Graby\Graby |
| 41 | arguments: | 41 | arguments: |
| 42 | - | 42 | - |
| 43 | error_message: "wallabag can't retrieve contents for this article. Please report this issue to us." | 43 | error_message: '%wallabag_core.fetching_error_message%' |
| 44 | http_client: | 44 | http_client: |
| 45 | user_agents: | 45 | user_agents: |
| 46 | 'lifehacker.com': 'PHP/5.2' | 46 | 'lifehacker.com': 'PHP/5.2' |