Merge branch 'release/v11.18'

rowers/dataprep.py

@@ -1569,6 +1569,9 @@ def new_workout_from_file(r, f2,
     dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
     dosummary = dosummary or summary == ''
 
+    if 'speedcoach2' in fileformat and workouttype == 'rower':
+        workouttype = 'water'
+
     if workoutsource is None:
         workoutsource = fileformat
 

rowers/tests/.~lock.viewnames.csv#

@@ -1 +0,0 @@
-,sander,sander-pc,29.02.2020 17:14,file:///home/sander/.config/libreoffice/4;