From: Eugen <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2017 22:24:38 +0000 (+0200)
Subject: Merge pull request #1125 from jasonrhodes/patch-1
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3cb13bdd84399737a2bb13c1ab58dedc2dbe3d76;p=mastodon.git

Merge pull request #1125 from jasonrhodes/patch-1

Email service options :P
---

3cb13bdd84399737a2bb13c1ab58dedc2dbe3d76
diff --cc .env.production.sample
index 44ca984b8,6d28a4a11..d7c04e235
--- a/.env.production.sample
+++ b/.env.production.sample
@@@ -25,10 -25,8 +25,11 @@@ OTP_SECRET
  # Only allow registrations with the following e-mail domains
  # EMAIL_DOMAIN_WHITELIST=example1.com|example2.de|etc
  
 +# Optionally change default language
 +# DEFAULT_LOCALE=de
 +
  # E-mail configuration
+ # Note: Mailgun and SparkPost (https://sparkpo.st/smtp) each have good free tiers
  SMTP_SERVER=smtp.mailgun.org
  SMTP_PORT=587
  SMTP_LOGIN=