aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2020-01-28 10:07:22 +0100
committerGitHub <noreply@github.com>2020-01-28 10:07:22 +0100
commit62107f50d3b43039a635dcaecce317ef0299ee1f (patch)
treeb35424d19bf21c5a8c02bb88ebcc2a5463bdb698 /app/config
parent8afcb3a6478325959c872fccf206bf8dc80d164c (diff)
parent1de4a8f938771b2a751a57056777aa4bcb8476c2 (diff)
downloadwallabag-62107f50d3b43039a635dcaecce317ef0299ee1f.tar.gz
wallabag-62107f50d3b43039a635dcaecce317ef0299ee1f.tar.zst
wallabag-62107f50d3b43039a635dcaecce317ef0299ee1f.zip
Merge pull request #4264 from herrriehm/master
cosmetic changes
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config_dev.yml2
-rw-r--r--app/config/wallabag.yml8
2 files changed, 5 insertions, 5 deletions
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 0c490575..fa6e14e7 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -36,7 +36,7 @@ monolog:
36 channels: [doctrine] 36 channels: [doctrine]
37 37
38swiftmailer: 38swiftmailer:
39 # see http://mailcatcher.me/ 39 # see https://mailcatcher.me/
40 transport: smtp 40 transport: smtp
41 host: 'localhost' 41 host: 'localhost'
42 port: 1025 42 port: 1025
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index f1ef0924..c54d7eb7 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -26,7 +26,7 @@ wallabag_core:
26 list_mode: 0 26 list_mode: 0
27 fetching_error_message_title: 'No title found' 27 fetching_error_message_title: 'No title found'
28 fetching_error_message: | 28 fetching_error_message: |
29 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>. 29 wallabag can't retrieve contents for this article. Please <a href="https://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
30 api_limit_mass_actions: 10 30 api_limit_mass_actions: 10
31 encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt" 31 encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
32 default_internal_settings: 32 default_internal_settings:
@@ -44,7 +44,7 @@ wallabag_core:
44 section: entry 44 section: entry
45 - 45 -
46 name: diaspora_url 46 name: diaspora_url
47 value: http://diasporapod.com 47 value: https://diasporapod.com
48 section: entry 48 section: entry
49 - 49 -
50 name: share_unmark 50 name: share_unmark
@@ -64,11 +64,11 @@ wallabag_core:
64 section: entry 64 section: entry
65 - 65 -
66 name: shaarli_url 66 name: shaarli_url
67 value: http://myshaarli.com 67 value: https://myshaarli.com
68 section: entry 68 section: entry
69 - 69 -
70 name: scuttle_url 70 name: scuttle_url
71 value: http://scuttle.org 71 value: https://scuttle.org
72 section: entry 72 section: entry
73 - 73 -
74 name: share_mail 74 name: share_mail