Merge remote-tracking branch 'origin/master' into port/2.6.10

2024-11-15 23:53:48 +01:00
parent c4fe061a2e 816d9f85d6
commit 8e9f908cf1
25 changed files with 591 additions and 196 deletions
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@ -114,6 +114,10 @@ parameters:
            name: export_xml
            value: 1
            section: export
+        -
+            name: export_md
+            value: 1
+            section: export
        -
            name: import_with_redis
            value: 0
@ -140,7 +144,7 @@ parameters:
            section: misc
        -
            name: wallabag_support_url
-            value: https://www.wallabag.org/pages/support.html
+            value: https://github.com/wallabag/wallabag/issues/new/choose
            section: misc
        -
            name: api_user_registration