From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 30 May 2017 07:59:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.3
X-Git-Tag: 2.3.0~31^2~85
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=d181bd728565454ec53d960f321ed0a4c3bf26c8;hp=7a90ca6171995e16b74f14712fafb42b636bdb3e

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

diff --git a/app/config/config.yml b/app/config/config.yml
index 73bf0a0d..9792616e 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -59,7 +59,7 @@ wallabag_core:
     action_mark_as_read: 1
     list_mode: 0
     fetching_error_message: |
-        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
+        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
     api_limit_mass_actions: 10
 
 wallabag_user:
diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index 6494f348..77dfd5bf 100644
--- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
@@ -12,7 +12,7 @@ use Wallabag\CoreBundle\Helper\RuleBasedTagger;
 
 class ContentProxyTest extends \PHPUnit_Framework_TestCase
 {
-    private $fetchingErrorMessage = 'wallabag can\'t retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.';
+    private $fetchingErrorMessage = 'wallabag can\'t retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.';
 
     public function testWithBadUrl()
     {