diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-12-15 20:25:25 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-12-15 20:25:25 +0100 |
commit | f3a4d57be14b40d1e3a6ad9e1a1f9337dafc872e (patch) | |
tree | 623c4b710fed94a7280587da7d66863ab489957c /.env.production.sample | |
parent | 3868ba683d56dbbeecc839fdeaeb7b3d0b18bb9a (diff) | |
parent | f847f67410c75036edb2c4b45d0db048af0481c9 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring
Diffstat (limited to '.env.production.sample')
-rw-r--r-- | .env.production.sample | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.env.production.sample b/.env.production.sample index da4c7fe4c..7bcce0f7e 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -103,7 +103,7 @@ VAPID_PUBLIC_KEY= # Sending mail # ------------ -SMTP_SERVER=smtp.mailgun.org +SMTP_SERVER= SMTP_PORT=587 SMTP_LOGIN= SMTP_PASSWORD= |