Merge branch 'develop' into feature/django2

2019-04-05 19:44:16 +02:00
parent 0797599be7 9488da2b37
commit b02179f0af
16 changed files with 687 additions and 207 deletions
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -48,6 +48,7 @@ from django.http import (
    )
 from django.contrib.auth import authenticate, login, logout
 from rowers.forms import (
+    ForceCurveOptionsForm,HistoForm,
    LoginForm,DocumentsForm,UploadOptionsForm,ImageForm,CourseForm,
    TeamUploadOptionsForm,WorkFlowLeftPanelForm,WorkFlowMiddlePanelForm,
    WorkFlowLeftPanelElement,WorkFlowMiddlePanelElement,