mirror of
https://github.com/wallabag/wallabag.git
synced 2024-09-27 14:00:15 +00:00
Merge remote-tracking branch 'origin/master' into 2.3
This commit is contained in:
commit
d181bd7285
2 changed files with 2 additions and 2 deletions
|
@ -59,7 +59,7 @@ wallabag_core:
|
||||||
action_mark_as_read: 1
|
action_mark_as_read: 1
|
||||||
list_mode: 0
|
list_mode: 0
|
||||||
fetching_error_message: |
|
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
|
api_limit_mass_actions: 10
|
||||||
|
|
||||||
wallabag_user:
|
wallabag_user:
|
||||||
|
|
|
@ -12,7 +12,7 @@ use Wallabag\CoreBundle\Helper\RuleBasedTagger;
|
||||||
|
|
||||||
class ContentProxyTest extends \PHPUnit_Framework_TestCase
|
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()
|
public function testWithBadUrl()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue