projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rich_media_titles_two' into 'develop'
[akkoma]
/
lib
/
pleroma
/
emails
/
user_email.ex
diff --git
a/lib/pleroma/emails/user_email.ex
b/lib/pleroma/emails/user_email.ex
index f475ebb9ffa5c7d76105aaadc810aaeb69fa5e03..8502a0d0c6d5ab189582fdbc2982f9a7c64d89a2 100644
(file)
--- a/
lib/pleroma/emails/user_email.ex
+++ b/
lib/pleroma/emails/user_email.ex
@@
-15,7
+15,8
@@
defmodule Pleroma.Emails.UserEmail do
defp instance_name, do: instance_config()[:name]
defp sender do
defp instance_name, do: instance_config()[:name]
defp sender do
- {instance_name(), instance_config()[:email]}
+ email = Keyword.get(instance_config(), :notify_email, instance_config()[:email])
+ {instance_name(), email}
end
defp recipient(email, nil), do: email
end
defp recipient(email, nil), do: email