Merge branch 'master' into month-billing-table

This commit is contained in:
Rebecca Law
2017-07-24 15:17:36 +01:00
33 changed files with 286 additions and 269 deletions

View File

@@ -1,4 +1,4 @@
from app.celery import QueueNames
from app.config import QueueNames
from app.notifications.validators import (
check_service_over_daily_message_limit,
validate_and_format_recipient,

View File

@@ -1,6 +1,6 @@
from flask import current_app
from app.celery import QueueNames
from app.config import QueueNames
from app.dao.services_dao import dao_fetch_service_by_id, dao_fetch_active_users_for_service
from app.dao.templates_dao import dao_get_template_by_id
from app.models import EMAIL_TYPE, KEY_TYPE_NORMAL