diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
commit | 5a619812ca3eb05a82a023ccdaee13501eb8d45f (patch) | |
tree | a1541999a3e13f9bb8b45d3a61320ee61aa4eb3c /src/Wallabag/CoreBundle/Resources/config/services.yml | |
parent | da4136557963018287cae61226e9006c3c741747 (diff) | |
parent | 84795d015b3c7e1af48a3dda3cb33cf080b66e8f (diff) | |
download | wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.gz wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.zst wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 56d776ad..9786ac27 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -55,6 +55,7 @@ services: | |||
55 | '.fok.nl': 'Googlebot/2.1' | 55 | '.fok.nl': 'Googlebot/2.1' |
56 | 'getpocket.com': 'PHP/5.2' | 56 | 'getpocket.com': 'PHP/5.2' |
57 | 'iansommerville.com': 'PHP/5.2' | 57 | 'iansommerville.com': 'PHP/5.2' |
58 | '.slashdot.org': 'PHP/5.2' | ||
58 | calls: | 59 | calls: |
59 | - [ setLogger, [ "@logger" ] ] | 60 | - [ setLogger, [ "@logger" ] ] |
60 | tags: | 61 | tags: |
@@ -91,7 +92,7 @@ services: | |||
91 | wallabag_core.helper.entries_export: | 92 | wallabag_core.helper.entries_export: |
92 | class: Wallabag\CoreBundle\Helper\EntriesExport | 93 | class: Wallabag\CoreBundle\Helper\EntriesExport |
93 | arguments: | 94 | arguments: |
94 | - "@craue_config" | 95 | - '@=service(''craue_config'').get(''wallabag_url'')' |
95 | - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png | 96 | - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png |
96 | 97 | ||
97 | wallabag.operator.array.matches: | 98 | wallabag.operator.array.matches: |