merge with upstream master

2017-12-19 15:18:35 +01:00
parent efb4547a37
commit 197db1003b
85 changed files with 2522 additions and 697 deletions
--- a/helix/api/api.py
+++ b/helix/api/api.py
@@ -5,7 +5,6 @@ from helix.presenters.panel_presenter import ProjectPresenter
 from helix.session_manager import SessionManager
 from helix.constants import redis_constant, sql_constant
 from helix.seismic_validator_user_values import SeismicValidatorUserValues
-from helix.validators.file_validator import FileValidator
 from helix.validators.seismic_anchor_validator import SeismicAnchorValidator

 api = Blueprint('api', __name__, template_folder='templates')