Merge branch 'master' of github.com:healthchecks/healthchecks

This commit is contained in:
Pēteris Caune 2015-10-28 10:01:49 +02:00
commit 99b6030eeb
2 changed files with 3 additions and 2 deletions

View File

@ -126,6 +126,6 @@ COMPRESS_OFFLINE = True
EMAIL_BACKEND = "djmail.backends.default.EmailBackend"
try:
from local_settings import *
from .local_settings import *
except ImportError as e:
warnings.warn("local_settings.py not found, using defaults")

View File

@ -1,8 +1,9 @@
Django==1.8.2
django_compressor
django-appconf
django-ses-backend
psycopg2==2.6
djmail
premailer
pygments
requests
requests