Skip to content

Commit

Permalink
Merge ddf8a23 into 6e7ed10
Browse files Browse the repository at this point in the history
  • Loading branch information
valeria-chemtai committed May 19, 2017
2 parents 6e7ed10 + ddf8a23 commit b9b6e6e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
5 changes: 5 additions & 0 deletions hc/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"""

import os
import sendgrid
import warnings
import dj_database_url

Expand Down Expand Up @@ -113,6 +114,10 @@
DISCORD_CLIENT_ID = None
DISCORD_CLIENT_SECRET = None

# sendgrid config
EMAIL_BACKEND = 'sgbackend.SendGridBackend'
SENDGRID_API_KEY = os.environ.get('SENDGRID_API_KEY')

# Slack integration -- override these in local_settings
SLACK_CLIENT_ID = None
SLACK_CLIENT_SECRET = None
Expand Down
3 changes: 3 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ premailer==2.9.6
psycopg2==2.7.1
pyparsing==2.2.0
python-dateutil==2.6.0
python-http-client==2.2.1
pytz==2016.7
rcssmin==1.0.6
requests==2.9.1
rjsmin==1.0.12
sendgrid==3.6.5
sendgrid-django==4.0.4
six==1.10.0
static3==0.7.0
twx.botapi==2.1.0

0 comments on commit b9b6e6e

Please sign in to comment.