nielsperetzke
/
healthchecks
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 32 Wiki Activity
Browse Source

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

pull/9/head
Pēteris Caune 9 years ago
parent
c5578ac44a d4bd406aa6
commit
99b6030eeb
2 changed files with 3 additions and 2 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      hc/settings.py
  2. +2
    -1
      requirements.txt

+ 1
- 1
hc/settings.py View File

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

+ 2
- 1
requirements.txt View File

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

Write Preview
Loading…
Cancel
Save