Merge branch 'develop' into feature/revisedimports

rowers/models.py

@@ -1810,6 +1810,11 @@ class WorkoutForm(ModelForm):
         self.fields['private'] = forms.BooleanField(initial=False,
                                                     required=False,
                                                     label='Private')
+        
+        self.fields['timezone'] = forms.ChoiceField(
+            choices = [(x,x) for x in pytz.common_timezones]
+            )
+        
         if 'instance' in kwargs:
             if kwargs['instance'].privacy == 'visible':
                 self.fields['private'].initial = False