Merge with master.

This commit is contained in:
Nicholas Staples
2016-03-29 22:50:40 +01:00
parent 3e16fc1962
commit 644336b151
16 changed files with 91 additions and 162 deletions

View File

@@ -26,10 +26,7 @@ from app.main.uploader import (
s3download
)
from app.main.dao import templates_dao
from app import (
job_api_client,
service_api_client
)
from app import (job_api_client, service_api_client)
from app.utils import user_has_permissions, get_errors_for_csv