Merge branch 'master' into stop-populating-mapping-tables

This commit is contained in:
Rebecca Law
2017-11-30 11:20:29 +00:00
3 changed files with 3 additions and 3 deletions

View File

@@ -4,7 +4,7 @@ import pytest
from freezegun import freeze_time
from tests.app.db import (
create_inbound_sms, create_service, create_service_with_inbound_number
create_inbound_sms, create_service, create_service_with_inbound_number,
)