Merge remote-tracking branch 'origin/master' into 2.2

2016-10-24 12:03:17 +02:00
parent 9313ea9d44 c64b4941d5
commit 64a8781e45
82 changed files with 654 additions and 1569 deletions
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@ -40,7 +40,7 @@ services:
        class: Graby\Graby
        arguments:
            -
-                error_message: "wallabag can't retrieve contents for this article. Please report this issue to us."
+                error_message: '%wallabag_core.fetching_error_message%'
                http_client:
                    user_agents:
                        'lifehacker.com': 'PHP/5.2'