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

2022-08-23 08:43:46 +02:00
parent 2f1f6e9c51 b73491e822
commit 131f21883d
15 changed files with 1069 additions and 876 deletions
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@ -1489,7 +1489,7 @@ class EntryControllerTest extends WallabagCoreTestCase
                'it',
            ],
            'zh_CN' => [
-                'http://www.hao123.com/shequ?__noscript__-=1',
+                'http://tuijian.hao123.com/tuijian/?__noscript__-=1',
                'zh_CN',
            ],
            'pt_BR' => [