diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
commit | 68003139e133835805b143b62c4407f19b495dab (patch) | |
tree | 9a71a15d021330fb6d55cc338f125161ddfc61dd /src/Wallabag/CoreBundle/Resources/config/services.yml | |
parent | bbd4ae7b56d9db744482a5630abad350f2d819af (diff) | |
parent | cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff) | |
download | wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip |
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/config/services.yml')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index dad9bd42..0036f45e 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -41,21 +41,6 @@ services: | |||
41 | arguments: | 41 | arguments: |
42 | - | 42 | - |
43 | error_message: '%wallabag_core.fetching_error_message%' | 43 | error_message: '%wallabag_core.fetching_error_message%' |
44 | http_client: | ||
45 | user_agents: | ||
46 | 'lifehacker.com': 'PHP/5.2' | ||
47 | 'gawker.com': 'PHP/5.2' | ||
48 | 'deadspin.com': 'PHP/5.2' | ||
49 | 'kotaku.com': 'PHP/5.2' | ||
50 | 'jezebel.com': 'PHP/5.2' | ||
51 | 'io9.com': 'PHP/5.2' | ||
52 | 'jalopnik.com': 'PHP/5.2' | ||
53 | 'gizmodo.com': 'PHP/5.2' | ||
54 | '.wikipedia.org': 'Mozilla/5.2' | ||
55 | '.fok.nl': 'Googlebot/2.1' | ||
56 | 'getpocket.com': 'PHP/5.2' | ||
57 | 'iansommerville.com': 'PHP/5.2' | ||
58 | '.slashdot.org': 'PHP/5.2' | ||
59 | calls: | 44 | calls: |
60 | - [ setLogger, [ "@logger" ] ] | 45 | - [ setLogger, [ "@logger" ] ] |
61 | tags: | 46 | tags: |