Merge upstream

This commit is contained in:
2020-07-14 17:44:11 -04:00
parent 44353ad37a
commit 489b8963c7
145 changed files with 3145 additions and 21875 deletions

View File

@@ -18,7 +18,7 @@ comments:
#
# When allowedOrigins is defined, only requests sent from one of the domains
# listed will be accepted. The origin is sent as part as the `options` object
# (e.g. <input name="options[origin]" value="http://yourdomain.com/post1")
# (e.g. <input name="options[origin]" value="https://yourdomain.com/post1")
# allowedOrigins: ["https://example.com"]
# (*) REQUIRED
@@ -67,7 +67,7 @@ comments:
# Notification settings. When enabled, users can choose to receive notifications
# via email when someone adds a reply or a new comment. This requires an account
# with Mailgun, which you can get for free at http://mailgun.com.
# with Mailgun, which you can get for free at https://mailgun.com.
# notifications:
# Enable notifications
# enabled: true