symposion_app Changeset - 50ee66d200bb

Changeset - 50ee66d200bb

Parent rev.

Child rev.

[Not reviewed]

Merge

1 14 0

Scott Bragg - 8 years ago 2016-09-18 02:40:45
jsbragg@scriptforge.org

Merge branch 'chrisjrn/better_mailer' of https://github.com/lca2017/symposion into chrisjrn/better_mailer

Conflicts:
symposion/utils/mail.py

1 file changed with 5 insertions and 0 deletions:

symposion/utils/mail.py

0 comments (0 inline, 0 general)

symposion/utils/mail.py

➞

Show inline comments

@@ ... / @@ -53,6 +53,11 @@ def __send_email__(template_prefix, to, kind, **kwargs): @@
     from_email = settings.DEFAULT_FROM_EMAIL
     try:
         bcc_email = settings.ENVELOPE_BCC_LIST
     except AttributeError:
         bcc_email = None
     try:
         bcc_email = settings.ENVELOPE_BCC_LIST
     except AttributeError:

0 comments (0 inline, 0 general)