Merge branch 'hotfix/v9.65' into develop

2019-04-03 21:08:54 +02:00
parent c8f7d5541c 815ef34491
commit 952e7384bb
2 changed files with 1 additions and 1 deletions
--- a/rowers/imports.py
+++ b/rowers/imports.py
@@ -43,7 +43,7 @@ from django.contrib.auth.decorators import login_required
 # from .models import Profile
 from rowingdata import rowingdata, make_cumvalues
 import pandas as pd
-from rowers.models import Rower,Workout,checkworkoutuser
+from rowers.models import Rower,Workout,checkworkoutuser,TombStone
 import rowers.mytypes as mytypes
 from rowsandall_app.settings import (
    C2_CLIENT_ID, C2_REDIRECT_URI, C2_CLIENT_SECRET,
--- a/rowers/tests/testdata/testdata.csv.gz
+++ b/rowers/tests/testdata/testdata.csv.gz